# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1332160429 -3600
# Node ID 09f638813477a6d01e7f96ae0460e5caa2d4b185
# Parent  f61058a128d39cd32669643e3754ae7b28b3af45
Relax an assertion that would incorrectly fail for boxed virtual objects.

diff -r f61058a128d3 -r 09f638813477 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Mon Mar 19 12:01:20 2012 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java	Mon Mar 19 13:33:49 2012 +0100
@@ -209,7 +209,7 @@
             } else {
                 popSlots = 1;
             }
-            assert stackAt(stackSize() - popSlots).kind().stackKind() == popKind.stackKind();
+            assert stackAt(stackSize() - popSlots).kind().stackKind() == popKind.stackKind() || (stackAt(stackSize() - popSlots) instanceof BoxedVirtualObjectNode && popKind.isObject());
         }
 
         int pushSlots = pushedValues.length;