Mercurial > hg > graal-compiler
changeset 13958:f80a8503cf24
Merge
author | Andreas Woess <andreas.woess@jku.at> |
---|---|
date | Fri, 14 Feb 2014 20:43:43 +0100 |
parents | 87709646a797 (diff) 5f077aa050c7 (current diff) |
children | 96bd95f62d92 |
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 Thu Feb 13 15:04:15 2014 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotDebugInfoBuilder.java Fri Feb 14 20:43:43 2014 +0100 @@ -56,7 +56,7 @@ ValueNode lock = state.lockAt(lockIndex); Value object = toValue(lock); boolean eliminated = object instanceof VirtualObject && state.monitorIdAt(lockIndex) != null; - assert eliminated || state.monitorIdAt(lockIndex).getLockDepth() == lockDepth; + assert state.monitorIdAt(lockIndex) == null || state.monitorIdAt(lockIndex).getLockDepth() == lockDepth; return new HotSpotMonitorValue(object, slot, eliminated); }