Refactor branch instructions to enable further optimizations.

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 536 matching lines @@
   if (HasParallelMove()) {
     parallel_move()->PrintTo(f);
   } else {
     f->Print("    ");
   }
   f->Print(" goto %d", successor()->block_id());
 }
 
 
 void BranchInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    %s:%d ", DebugName(), deopt_id());
+  f->Print("    %s ", DebugName());
   f->Print("if ");
-  left()->PrintTo(f);
-  f-> Print(" %s ", Token::Str(kind()));
-  right()->PrintTo(f);
+  computation()->PrintTo(f);
 
   f->Print(" goto (%d, %d)",
             true_successor()->block_id(),
             false_successor()->block_id());
-  if (HasICData()) {
-    PrintICData(f, *ic_data());
-  }
-}
-
-
-void StrictCompareAndBranchInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    %s", DebugName());
-  f->Print("if ");
-  left()->PrintTo(f);
-  f-> Print(" %s ", Token::Str(kind()));
-  right()->PrintTo(f);
-  f->Print(" goto (%d, %d)",
-            true_successor()->block_id(),
-            false_successor()->block_id());
 }
 
 
 void ParallelMoveInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s ", DebugName());
   for (intptr_t i = 0; i < moves_.length(); i++) {
     if (i != 0) f->Print(", ");
     moves_[i]->dest().PrintTo(f);
     f->Print(" <- ");
     moves_[i]->src().PrintTo(f);
@@ skipping 230 matching lines @@
 
 
 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 ");
-  left()->PrintTo(f);
-  f-> Print(" %s ", Token::Str(kind()));
-  right()->PrintTo(f);
-  f->Print(" goto (B%d, B%d)",
-            true_successor()->block_id(),
-            false_successor()->block_id());
-}
-
-
-void StrictCompareAndBranchInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ %s ", DebugName());
-  f->Print("if ");
-  left()->PrintTo(f);
-  f-> Print(" %s ", Token::Str(kind()));
-  right()->PrintTo(f);
+  computation()->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 ((locations_ != NULL) && !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart