Mercurial > hg > graal-jvmci-8
changeset 21092:87aac173f09d
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 22 Apr 2015 21:58:23 +0200 |
parents | de2fb3e4df49 (current diff) 266eef1c29e0 (diff) |
children | a11325faa4d9 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Wed Apr 22 19:50:30 2015 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Wed Apr 22 21:58:23 2015 +0200 @@ -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); }