# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1429727905 25200
# Node ID 266eef1c29e049440b5cb0c7f6913dd6a4a7762f
# Parent  2e9250b29d1417e3ebe15fff9b0ed3eccf7eb80b
Mark locks without MonitorIdNode as eliminated

diff -r 2e9250b29d14 -r 266eef1c29e0 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java	Wed Apr 22 16:54:26 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java	Wed Apr 22 11:38:25 2015 -0700
@@ -55,7 +55,7 @@
         StackSlotValue slot = lockStack.makeLockSlot(lockDepth);
         ValueNode lock = state.lockAt(lockIndex);
         Value object = toValue(lock);
-        boolean eliminated = object instanceof VirtualObject && state.monitorIdAt(lockIndex) != null;
+        boolean eliminated = object instanceof VirtualObject || state.monitorIdAt(lockIndex) == null;
         assert state.monitorIdAt(lockIndex) == null || state.monitorIdAt(lockIndex).getLockDepth() == lockDepth;
         return new StackLockValue(object, slot, eliminated);
     }