Mercurial > hg > truffle

changeset 5102:09f638813477

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Relax an assertion that would incorrectly fail for boxed virtual objects.
author Andreas Woess <andreas.woess@jku.at>
date Mon, 19 Mar 2012 13:33:49 +0100
parents f61058a128d3
children 276e14614531 e5427faad192 4eb9895d9afe
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/FrameState.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;