Mercurial > hg > truffle
changeset 17300:a926a44acfc6
fix NPE in graph scheduling validation
author | Lukas Stadler <lukas.stadler@oracle.com> |
---|---|
date | Wed, 01 Oct 2014 14:45:06 +0200 |
parents | 072a25e613ba |
children | ed30fa9d37ac |
files | graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Wed Oct 01 14:24:59 2014 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java Wed Oct 01 14:45:06 2014 +0200 @@ -211,8 +211,8 @@ if (node instanceof AbstractEndNode) { MergeNode merge = ((AbstractEndNode) node).merge(); for (PhiNode phi : merge.phis()) { - assert currentState.isMarked(phi.valueAt((AbstractEndNode) node)) : phi.valueAt((AbstractEndNode) node) + " not available at phi " + phi + " / end " + node + - " in block " + block; + ValueNode phiValue = phi.valueAt((AbstractEndNode) node); + assert phiValue == null || currentState.isMarked(phiValue) : phiValue + " not available at phi " + phi + " / end " + node + " in block " + block; } } if (stateAfter != null) {