Automatic merge of master into galahad

Author: OracleLabsAutomation

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/virtual/phases/ea/EffectsClosure.java

@@ -355,6 +355,7 @@ protected BlockT merge(HIRBlock merge, List<BlockT> states) {
     @Override
     @SuppressWarnings("try")
     protected final List<BlockT> processLoop(CFGLoop<HIRBlock> loop, BlockT initialState) {
+        final StructuredGraph graph = loop.getHeader().getBeginNode().graph();
         if (initialState.isDead()) {
             ArrayList<BlockT> states = new ArrayList<>();
             for (int i = 0; i < loop.getLoopExits().size(); i++) {
@@ -425,6 +426,8 @@ protected final List<BlockT> processLoop(CFGLoop<HIRBlock> loop, BlockT initialS
                 loopLocationKillCacheCopy.putAll(loopLocationKillCache);
             }
         }
+
+        boolean tooManyIterationsSeen = false;
         while (true) { // // TERMINATION ARGUMENT: bound by number of basic blocks and iterative
                        // loop traversal
             CompilationAlarm.checkProgress(cfg.graph);
@@ -538,7 +541,18 @@ protected final List<BlockT> processLoop(CFGLoop<HIRBlock> loop, BlockT initialS
                 currentMode = EffectsClosureMode.MATERIALIZE_ALL;
                 continue;
             }
-            throw new GraalError("too many iterations at %s", loop);
+            if (!tooManyIterationsSeen) {
+                tooManyIterationsSeen = true;
+                /*
+                 * The first time we see that we did too many iterations we materialize everything
+                 * before the loop and see if that fixes our problems.
+                 */
+                graph.getDebug().dump(DebugContext.VERY_DETAILED_LEVEL, graph, "Too many loop iterations for %s trying to materialize everything before loop and redo loop nest", loop);
+                currentMode = EffectsClosureMode.MATERIALIZE_ALL;
+                continue;
+            } else {
+                throw new GraalError("too many iterations at %s", loop);
+            }
         }
     }