# HG changeset patch # User Gilles Duboscq # Date 1356019594 -3600 # Node ID 641f41d8342b34ffddef4129ac4c42a03f1e95d4 # Parent f51e46b4d7cf36ee9495ba8a1338f9fd14516e13 Fix StructuredGraph.reduceTrivialMerge: fix for degenerated loops diff -r f51e46b4d7cf -r 641f41d8342b graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Thu Dec 20 16:33:10 2012 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java Thu Dec 20 17:06:34 2012 +0100 @@ -337,13 +337,13 @@ phi.replaceAtUsages(singleValue); phi.safeDelete(); } - EndNode singleEnd = merge.forwardEndAt(0); - FixedNode sux = merge.next(); - FrameState stateAfter = merge.stateAfter(); // remove loop exits if (merge instanceof LoopBeginNode) { ((LoopBeginNode) merge).removeExits(); } + EndNode singleEnd = merge.forwardEndAt(0); + FixedNode sux = merge.next(); + FrameState stateAfter = merge.stateAfter(); // evacuateGuards merge.prepareDelete((FixedNode) singleEnd.predecessor()); merge.safeDelete();