Mercurial > hg > truffle

changeset 15753:4f32154c34ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Mon, 19 May 2014 11:59:54 +0200
parents 131be7997721 (current diff) 928475f5c2f1 (diff)
children 45285c8eccbd
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java	Mon May 19 11:29:14 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java	Mon May 19 11:59:54 2014 +0200
@@ -62,7 +62,6 @@
             return;
         }
         Node predecessor = deopt.predecessor();
-        assert predecessor instanceof MergeNode;
         if (predecessor instanceof MergeNode) {
             MergeNode merge = (MergeNode) predecessor;
 
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java	Mon May 19 11:29:14 2014 +0200
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java	Mon May 19 11:59:54 2014 +0200
@@ -224,7 +224,8 @@
                     if (pendingStateAfter != null) {
                         pendingStateAfter.applyToNonVirtual(new NodeClosure<Node>() {
                             public void apply(Node usage, Node nonVirtualNode) {
-                                assert currentState.isMarked(nonVirtualNode) : nonVirtualNode + " not available at virtualstate " + usage + " at end of block " + block + " \n" + list;
+                                assert currentState.isMarked(nonVirtualNode) || nonVirtualNode instanceof VirtualObjectNode : nonVirtualNode + " not available at virtualstate " + usage +
+                                                " at end of block " + block + " \n" + list;
                             }
                         });
                     }