Revert r9253 because of dartium test failures

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 26 matching lines @@
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     // Print the block entry.
     PrintInstruction(block_order_[i]);
     Instruction* current = block_order_[i]->StraightLineSuccessor();
     // And all the successors until an exit, branch, or a block entry.
     while ((current != NULL) && !current->IsBlockEntry()) {
       OS::Print("\n");
       PrintInstruction(current);
       current = current->StraightLineSuccessor();
     }
+    BlockEntryInstr* successor =
+        (current == NULL) ? NULL : current->AsBlockEntry();
+    if (successor != NULL) {
+      OS::Print(" goto %d", successor->block_id());
+    }
     OS::Print("\n");
   }
 }
 
 
 void FlowGraphPrinter::PrintInstruction(Instruction* instr) {
   char str[120];
   BufferFormatter f(str, sizeof(str));
   instr->PrintTo(&f);
   OS::Print("%s", str);
@@ skipping 343 matching lines @@
   }
   if (is_negated()) {
     f->Print(" (negated)");
   }
   f->Print(" goto (%d, %d)",
             true_successor()->block_id(),
             false_successor()->block_id());
 }
 
 
-void GotoInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    goto %d", successor_->block_id());
-}
-
-
 void ParallelMoveInstr::PrintTo(BufferFormatter* f) const {
   UNIMPLEMENTED();
 }
 
 
 void FlowGraphVisualizer::Print(const char* format, ...) {
   char str[120];
   BufferFormatter f(str, sizeof(str));
   f.Print("%*s", 2 * indent_, "");
   va_list args;
@@ skipping 99 matching lines @@
         Print("0 0 ");  // Required fields "bci" and "use". Unused.
         Instruction* current = block_order_[i];
         PrintInstruction(current);
         current = current->StraightLineSuccessor();
         // And all the successors until an exit, branch, or a block entry.
         while ((current != NULL) && !current->IsBlockEntry()) {
           Print("0 0 ");
           PrintInstruction(current);
           current = current->StraightLineSuccessor();
         }
+        BlockEntryInstr* successor =
+            (current == NULL) ? NULL : current->AsBlockEntry();
+        if (successor != NULL) {
+          Print("0 0 _ Goto B%d <|@\n", successor->block_id());
+        }
         END("HIR");
       }
       END("block");
     }
     END("cfg");
   }
 #undef BEGIN
 #undef END
 }
 
@@ skipping 88 matching lines @@
 void BranchInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   f->Print("if ");
   value()->PrintTo(f);
   f->Print(" goto (B%d, B%d)",
             true_successor()->block_id(),
             false_successor()->block_id());
 }
 
 
-void GotoInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ Goto (B%d)", successor_->block_id());
-}
-
-
 void ParallelMoveInstr::PrintToVisualizer(BufferFormatter* f) const {
   UNIMPLEMENTED();
 }
 
 
 
 }  // namespace dart