Avoid critical edge on do/while, and do not make handleLoopInfo return conditionnaly false: block b…

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of ssa;
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
@@ skipping 2031 matching lines @@
         bodyEntryBlock.setBlockFlow(info, conditionBlock);
       }
       open(conditionBlock);
 
       visit(node.condition);
       assert(!isAborted());
       HInstruction conditionInstruction = popBoolified();
       conditionEndBlock = close(
           new HLoopBranch(conditionInstruction, HLoopBranch.DO_WHILE_LOOP));
 
-      conditionEndBlock.addSuccessor(loopEntryBlock);  // The back-edge.
+      HBasicBlock avoidCriticalEdge = addNewBlock();
+      conditionEndBlock.addSuccessor(avoidCriticalEdge);  // The back-edge.

[Lasse Reichstein Nielsen, 2012/11/16 15:12:17]

Seems like the avoidCriticalEdge's successor is the back-edge.

[ngeoffray, 2012/11/16 16:39:45]

Done.

+      open(avoidCriticalEdge);
+      close(new HGoto());
+      avoidCriticalEdge.addSuccessor(loopEntryBlock);
+
       conditionExpression =
           new SubExpression(conditionBlock, conditionEndBlock);
     }
 
     loopEntryBlock.postProcessLoopHeader();
 
     endLoop(loopEntryBlock, conditionEndBlock, jumpHandler, localsHandler);
     jumpHandler.close();
 
     SubGraph bodyGraph = new SubGraph(bodyEntryBlock, bodyExitBlock);
@@ skipping 2781 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }