# HG changeset patch
# User Miguel Garcia <miguel.m.garcia@oracle.com>
# Date 1400493594 -7200
# Node ID 4f32154c34ffc81b9e461dc4a419011ae8703799
# Parent  131be79977213482774a46923cce0561d09593f5# Parent  928475f5c2f17ee516cce30beb9c14a6a7f1059c
Merge

diff -r 131be7997721 -r 4f32154c34ff graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/UseTrappingNullChecksPhase.java
--- 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;
 
diff -r 131be7997721 -r 4f32154c34ff graal/com.oracle.graal.phases/src/com/oracle/graal/phases/util/GraphOrder.java
--- 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;
                             }
                         });
                     }