# HG changeset patch # User Lukas Stadler # Date 1398241579 -7200 # Node ID 9b122a4d2e947de31dac10c3e8850ca4caff3d50 # Parent 2f1aefd300792f577e7cc91df4080010fdee4199 correctly schedule loop proxies diff -r 2f1aefd30079 -r 9b122a4d2e94 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java --- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Wed Apr 23 10:26:18 2014 +0200 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/schedule/SchedulePhase.java Wed Apr 23 10:26:19 2014 +0200 @@ -986,13 +986,21 @@ stateAfter = ((StateSplit) i).stateAfter(); } + if (i instanceof LoopExitNode) { + for (ProxyNode proxy : ((LoopExitNode) i).proxies()) { + addToLatestSorting(b, proxy, sortedInstructions, visited, reads, beforeLastLocation); + } + } + for (Node input : i.inputs()) { if (input instanceof FrameState) { if (input != stateAfter) { addUnscheduledToLatestSorting(b, (FrameState) input, sortedInstructions, visited, reads, beforeLastLocation); } } else { - addToLatestSorting(b, (ScheduledNode) input, sortedInstructions, visited, reads, beforeLastLocation); + if (!(i instanceof ProxyNode && input instanceof LoopExitNode)) { + addToLatestSorting(b, (ScheduledNode) input, sortedInstructions, visited, reads, beforeLastLocation); + } } }