Revert "Revert "Introduce Goto instructions to the flow graph.""

runtime/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 376 matching lines @@
   f->Print("    v%d <- phi(", ssa_temp_index());
   for (intptr_t i = 0; i < inputs_.length(); ++i) {
     if (inputs_[i] != NULL) inputs_[i]->PrintTo(f);
     if (i < inputs_.length() - 1) f->Print(",");
   }
   f->Print(")");
 }
 
 
 void ParameterInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    v%d <- parameter(%d)", index());
+  f->Print("    v%d <- parameter(%d)",
+           (ssa_temp_index() != -1) ? ssa_temp_index() : temp_index(),
+           index());
 }
 
 
 void TargetEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [target", block_id());
   if (HasTryIndex()) {
     f->Print(" catch %d]", try_index());
   } else {
     f->Print("]");
   }
@@ skipping 25 matching lines @@
 
 
 void ReThrowInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s ", DebugName());
   exception()->PrintTo(f);
   f->Print(", ");
   stack_trace()->PrintTo(f);
 }
 
 
+void GotoInstr::PrintTo(BufferFormatter* f) const {
+  f->Print("    goto %d", successor()->block_id());
+}
+
+
 void BranchInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s ", DebugName());
   f->Print("if ");
   if (is_fused_with_comparison()) {
     if (is_negated()) f->Print(" not ");
     fused_with_comparison_->PrintTo(f);
   } else {
     value()->PrintTo(f);
   }
 
@@ skipping 231 matching lines @@
 
 
 void ReThrowInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   exception()->PrintTo(f);
   f->Print(", ");
   stack_trace()->PrintTo(f);
 }
 
 
+void GotoInstr::PrintToVisualizer(BufferFormatter* f) const {
+  f->Print("_ goto B%d", successor()->block_id());
+}
+
+
 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 ParallelMoveInstr::PrintToVisualizer(BufferFormatter* f) const {
   UNIMPLEMENTED();
 }
 
 
 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);
     if ((i < locations_.length()) && !locations_[i].IsInvalid()) {
       f->Print(" [%s]", locations_[i].Name());
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart