Add forward iterator to iterate instructions inside a basic block.

vm/il_printer.cc

 // 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.
 
 #include "vm/il_printer.h"
 
 #include "vm/intermediate_language.h"
 #include "vm/os.h"
 
 namespace dart {
@@ skipping 21 matching lines @@
 
 
 void FlowGraphPrinter::PrintBlocks() {
   if (!function_.IsNull()) {
     OS::Print("==== %s\n", function_.ToFullyQualifiedCString());
   }
 
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     // Print the block entry.
     PrintInstruction(block_order_[i]);
-    Instruction* current = block_order_[i]->successor();
     // And all the successors until an exit, branch, or a block entry.
-    while ((current != NULL) && !current->IsBlockEntry()) {
+    Instruction* current = block_order_[i];
+    for (ForwardInstructionIterator it(current->AsBlockEntry());
+         !it.Done();
+         it.Advance()) {
+      current = it.Current();
       OS::Print("\n");
       PrintInstruction(current);
-      current = current->successor();
     }
-    BlockEntryInstr* successor =
-        (current == NULL) ? NULL : current->AsBlockEntry();
-    if (successor != NULL) {
-      OS::Print(" goto %d", successor->block_id());
+    if (current->successor() != NULL) {
+      ASSERT(current->successor()->IsBlockEntry());
+      OS::Print(" goto %d", current->successor()->AsBlockEntry()->block_id());
     }
     OS::Print("\n");
   }
 }
 
 
 void FlowGraphPrinter::PrintInstruction(Instruction* instr) {
   char str[1000];
   BufferFormatter f(str, sizeof(str));
   instr->PrintTo(&f);
@@ skipping 458 matching lines @@
           }
           END("locals");
         }
         END("states");
       }
 
       {
         BEGIN("HIR");
         // Print the block entry.
         Print("0 0 ");  // Required fields "bci" and "use". Unused.
+        PrintInstruction(block_order_[i]);
+        // And all the successors until an exit, branch, or a block entry.
         Instruction* current = block_order_[i];
-        PrintInstruction(current);
-        current = current->successor();
-        // And all the successors until an exit, branch, or a block entry.
-        while ((current != NULL) && !current->IsBlockEntry()) {
+        for (ForwardInstructionIterator it(current->AsBlockEntry());
+             !it.Done();
+             it.Advance()) {
+          current = it.Current();
           Print("0 0 ");
           PrintInstruction(current);
-          current = current->successor();
         }
-        BlockEntryInstr* successor =
-            (current == NULL) ? NULL : current->AsBlockEntry();
-        if (successor != NULL) {
-          Print("0 0 _ Goto B%d <|@\n", successor->block_id());
+        if (current->successor() != NULL) {
+          ASSERT(current->successor()->IsBlockEntry());
+          Print("0 0 _ Goto B%d <|@\n",
+                current->successor()->AsBlockEntry()->block_id());
         }
         END("HIR");
       }
       END("block");
     }
     END("cfg");
   }
 #undef BEGIN
 #undef END
 }
@@ skipping 110 matching lines @@
 void Environment::PrintTo(BufferFormatter* f) const {
   f->Print(" env={ ");
   for (intptr_t i = 0; i < values_.length(); ++i) {
     if (i > 0) f->Print(", ");
     values_[i]->PrintTo(f);
   }
   f->Print(" }");
 }
 
 }  // namespace dart