# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1304943073 -7200
# Node ID 5768534fd4e5e18a2b5af0e1b4555a3e31b0de35
# Parent  dfb1a952a2030ddb46ea4f647651c4ad3d7ec78b
Fixed merge regression around genMonitorEnter.

diff -r dfb1a952a203 -r 5768534fd4e5 graal/GraalCompiler/src/com/sun/c1x/graph/GraphBuilder.java
--- 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));