Always move out of loops when value proxies are in the graph.

zcfrank1st · Mar 8, 2017 · 623d6f4 · 623d6f4
1 parent 38468d9
commit 623d6f4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...l/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/...l/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
@@ -519,9 +519,12 @@ protected void calcLatestBlock(Block earliestBlock, SchedulingStrategy strategy,
                     while (currentBlock.getLoopDepth() > earliestBlock.getLoopDepth() && currentBlock != earliestBlock.getDominator()) {
                         Block previousCurrentBlock = currentBlock;
                         currentBlock = currentBlock.getDominator();
-                        if (previousCurrentBlock.isLoopHeader() && currentBlock.probability() < latestBlock.probability()) {
-                            // Only assign new latest block if frequency is actually lower.
-                            latestBlock = currentBlock;
+                        if (previousCurrentBlock.isLoopHeader()) {
+                            if (currentBlock.probability() < latestBlock.probability() || ((StructuredGraph) currentNode.graph()).hasValueProxies()) {
+                                // Only assign new latest block if frequency is actually lower or if
+                                // loop proxies would be required otherwise.
+                                latestBlock = currentBlock;
+                            }
                         }
                     }
                 }