Turn definitions that do not produce results (e.g. Checks) into instructions.

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"
 #include "vm/parser.h"
 
@@ skipping 136 matching lines @@
   if (definition.is_used()) {
     if (definition.HasSSATemp()) {
       f->Print("v%"Pd, definition.ssa_temp_index());
     } else if (definition.temp_index() != -1) {
       f->Print("t%"Pd, definition.temp_index());
     }
   }
 }
 
 
+void Instruction::PrintTo(BufferFormatter* f) const {
+  f->Print("%s:%"Pd"(", DebugName(), GetDeoptId());
+  PrintOperandsTo(f);
+  f->Print(")");
+}
+
+
+void Instruction::PrintOperandsTo(BufferFormatter* f) const {
+  for (int i = 0; i < InputCount(); ++i) {
+    if (i > 0) f->Print(", ");
+    if (InputAt(i) != NULL) InputAt(i)->PrintTo(f);
+  }
+}
+
+
+void Instruction::PrintToVisualizer(BufferFormatter* f) const {
+  PrintTo(f);
+}
+
+
 void Definition::PrintTo(BufferFormatter* f) const {
   PrintUse(f, *this);
   if (is_used()) {
     if (HasSSATemp() || (temp_index() != -1)) f->Print(" <- ");
   }
   f->Print("%s:%"Pd"(", DebugName(), GetDeoptId());
   PrintOperandsTo(f);
   f->Print(")");
   PrintPropagatedType(f, *this);
 }
@@ skipping 346 matching lines @@
     parallel_move()->PrintTo(f);
   }
 }
 
 
 void PushArgumentInstr::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
 }
 
 
-void ReturnInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("%s ", DebugName());
-  value()->PrintTo(f);
-}
-
-
-void ThrowInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("%s" , DebugName());
-}
-
-
-void ReThrowInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("%s ", DebugName());
-}
-
-
 void GotoInstr::PrintTo(BufferFormatter* f) const {
   if (HasParallelMove()) {
     parallel_move()->PrintTo(f);
     f->Print(" ");
   }
   f->Print("goto:%"Pd" %"Pd"", GetDeoptId(), successor()->block_id());
 }
 
 
 void BranchInstr::PrintTo(BufferFormatter* f) const {
@@ skipping 193 matching lines @@
   }
 }
 
 
 void PushArgumentInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
-void ReturnInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ %s ", DebugName());
-  value()->PrintTo(f);
-}
-
-
-void ThrowInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ %s ", DebugName());
-}
-
-
-void ReThrowInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ %s ", DebugName());
-}
-
-
 void GotoInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ goto B%"Pd"", successor()->block_id());
 }
 
 
 void BranchInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   f->Print("if ");
   comparison()->PrintTo(f);
   f->Print(" goto (B%"Pd", B%"Pd")",
@@ skipping 21 matching lines @@
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
   if (outer_ != NULL) outer_->PrintTo(f);
 }
 
 }  // namespace dart