Mercurial > hg > truffle

changeset 2615:5768534fd4e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed merge regression around genMonitorEnter.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 09 May 2011 14:11:13 +0200
parents dfb1a952a203
children 3558ca7088c0 15774da89658
files graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Mon May 09 10:54:09 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java	Mon May 09 14:11:13 2011 +0200
@@ -1043,7 +1043,9 @@
             lockAddress = new MonitorAddress(lockNumber, graph);
             append(lockAddress);
         }
-        MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, null, graph);
+        frameState.push(CiKind.Object, x);
+        MonitorEnter monitorEnter = new MonitorEnter(x, lockAddress, lockNumber, frameState.create(bci()), graph);
+        frameState.apop();
         appendWithoutOptimization(monitorEnter, bci);
         frameState.lock(ir, x, lockNumber + 1);
         monitorEnter.setStateAfter(frameState.create(bci));