Wrap block-informations when embedding them in the graph.

lib/compiler/implementation/ssa/bailout.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.
 
 class BailoutInfo {
   int instructionId;
   int bailoutId;
   BailoutInfo(this.instructionId, this.bailoutId);
 }
 
@@ skipping 298 matching lines @@
     }
   }
 
   void visitBasicBlock(HBasicBlock block) {
     // Abort traversal if we are leaving the currently active sub-graph.
     if (!subGraph.contains(block)) return;
 
     if (block.isLoopHeader()) {
       blocks.addLast(block);
     } else if (block.isLabeledBlock() && blocks.last() !== block) {
-      HLabeledBlockInformation info = block.blockInformation;
+      HLabeledBlockInformation info = block.blockFlow.body;
       visitStatements(info.body);
       return;
     }
 
     HInstruction instruction = block.first;
     while (instruction != null) {
       instruction.accept(this);
       instruction = instruction.next;
     }
   }
 
   void visitStatements(HStatementInformation info) {
     assert(info is HSubGraphBlockInformation);
     HSubGraphBlockInformation graph = info;
     visitSubGraph(graph.subGraph);
   }
 
   void visitSubGraph(SubGraph graph) {
     SubGraph oldSubGraph = subGraph;
     subGraph = graph;
     HBasicBlock start = graph.start;
     blocks.addLast(start);
     visitBasicBlock(start);
     blocks.removeLast();
     subGraph = oldSubGraph;
 
     if (start.isLabeledBlock()) {
-      HLabeledBlockInformation info = start.blockInformation;
-      if (info.joinBlock !== null) {
-        visitBasicBlock(info.joinBlock);
+      HBasicBlock continuation = start.blockFlow.continuation;
+      if (continuation !== null) {
+        visitBasicBlock(continuation);
       }
     }
   }
 
   void visitIf(HIf instruction) {
     int preVisitedBlocks = 0;
-    HIfBlockInformation info = instruction.blockInformation;
+    HIfBlockInformation info = instruction.blockInformation.body;
     visitStatements(info.thenGraph);
     preVisitedBlocks++;
     if (instruction.hasElse) {
       visitStatements(info.elseGraph);
       preVisitedBlocks++;
     }
 
-    if (info.joinBlock !== null
-        && info.joinBlock.dominator !== instruction.block) {
+    HBasicBlock joinBlock = instruction.joinBlock;
+    if (joinBlock !== null
+        && joinBlock.dominator !== instruction.block) {
       // The join block is dominated by a block in one of the branches.
       // The subgraph traversal never reached it, so we visit it here
       // instead.
-      visitBasicBlock(info.joinBlock);
+      visitBasicBlock(joinBlock);
     }
 
     // Visit all the dominated blocks that are not part of the then or else
     // branches, and is not the join block.
     // Depending on how the then/else branches terminate
     // (e.g., return/throw/break) there can be any number of these.
     List<HBasicBlock> dominated = instruction.block.dominatedBlocks;
     int dominatedCount = dominated.length;
     for (int i = preVisitedBlocks; i < dominatedCount; i++) {
       HBasicBlock dominatedBlock = dominated[i];
@@ skipping 30 matching lines @@
       }
     }
   }
 
   visitTypeGuard(HTypeGuard guard) {
     blocks.forEach((HBasicBlock block) {
       block.guards.add(guard);
     });
   }
 }