# HG changeset patch # User Thomas Wuerthinger # Date 1358378676 -3600 # Node ID bf7a1be7c709b8226a55c6c64c646192f85f7de7 # Parent 63eb224c2c36e8378bf9d8b9955e49ec98e5fbc0 Fix assertion in lock elimination phase. diff -r 63eb224c2c36 -r bf7a1be7c709 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LockEliminationPhase.java --- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LockEliminationPhase.java Thu Jan 17 00:06:39 2013 +0100 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LockEliminationPhase.java Thu Jan 17 00:24:36 2013 +0100 @@ -37,6 +37,7 @@ if (next instanceof MonitorEnterNode) { MonitorEnterNode monitorEnterNode = (MonitorEnterNode) next; if (monitorEnterNode.object() == node.object()) { + monitorEnterNode.setNext(null); ((FixedWithNextNode) node.predecessor()).setNext(monitorEnterNode.next()); FrameState stateAfterFirst = node.stateAfter(); FrameState stateAfterSecond = monitorEnterNode.stateAfter();