Fix another bailout problem where not all blocks were visiting when propagating bailout information…

sdk/lib/_internal/compiler/implementation/ssa/codegen.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 SsaCodeGeneratorTask extends CompilerTask {
 
   final JavaScriptBackend backend;
 
@@ skipping 2651 matching lines @@
   }
 
   String currentLabel() {
     return labels.last;
   }
 
   js.VariableUse generateStateUse()
       => new js.VariableUse(variableNames.stateName);
 
   HBasicBlock beginGraph(HGraph graph) {
-    propagator =
-        new SsaBailoutPropagator(compiler, generateAtUseSite, variableNames);
+    propagator = new SsaBailoutPropagator(compiler, variableNames);
     propagator.visitGraph(graph);
     // TODO(ngeoffray): We could avoid generating the state at the
     // call site for non-complex bailout methods.
     newParameters.add(new js.Parameter(variableNames.stateName));
 
     List<String> names = new List<String>(propagator.bailoutArity);
     for (String variable in propagator.parameterNames.keys) {
       int index = propagator.parameterNames[variable];
       assert(names[index] == null);
       names[index] = variable;
@@ skipping 39 matching lines @@
   }
 
   visitParameterValue(HParameterValue node) {
     // Nothing to do, parameters are dealt with specially in a bailout
     // method.
   }
 
   bool visitAndOrInfo(HAndOrBlockInformation info) => false;
 
   visitLoopBranch(HLoopBranch node) {
-    HBasicBlock header = node.isDoWhile()
-        ? node.block.successors[0]
-        : node.block;
-    if (header.hasBailoutTargets()) {
+    if (node.loopHeader.hasBailoutTargets()) {
       // The graph visitor in [visitLoopInfo] does not handle the
       // condition. We must instead manually emit it here.
       handleLoopCondition(node);
       // We must also visit the body from here.
       // For a do while loop, the body has already been visited.
       if (!node.isDoWhile()) {
         visitBasicBlock(node.block.dominatedBlocks[0]);
       }
     } else {
       super.visitLoopBranch(node);
     }
   }
 
 
   bool visitIfInfo(HIfBlockInformation info) {
     if (info.thenGraph.start.hasBailoutTargets()) return false;
     if (info.elseGraph.start.hasBailoutTargets()) return false;
     return super.visitIfInfo(info);
   }
 
   bool visitLoopInfo(HLoopBlockInformation info) {
     // Always emit with block flow traversal.
     if (info.loopHeader.hasBailoutTargets()) {
       // If there are any bailout targets in the loop, we cannot use
       // the pretty [SsaCodeGenerator.visitLoopInfo] printer.
       if (info.initializer != null) {
         generateStatements(info.initializer);
       }
       beginLoop(info.loopHeader);
-      generateStatements(info.condition);
+      if (!info.isDoWhile()) {
+        generateStatements(info.condition);
+      }
       generateStatements(info.body);
+      if (info.isDoWhile()) {
+        generateStatements(info.condition);
+      }
       if (info.updates != null) {
         generateStatements(info.updates);
       }
       endLoop(info.end);
       return true;
     }
     return super.visitLoopInfo(info);
   }
 
   bool visitTryInfo(HTryBlockInformation info) => false;
@@ skipping 217 matching lines @@
   if (leftType.canBeNull() && rightType.canBeNull()) {
     if (left.isConstantNull() || right.isConstantNull() ||
         (leftType.isPrimitive() && leftType == rightType)) {
       return '==';
     }
     return null;
   } else {
     return '===';
   }
 }