Revert r13022 (revert inlining of methods with control flow), Review URL: https://codereview.chromi…

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 520 matching lines @@
       Definition* def = defns[i];
       f->Print("\n      ");
       def->PrintTo(f);
     }
     f->Print("\n}");
   }
 }
 
 
 void JoinEntryInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("B%"Pd"[join]", block_id());
+  f->Print("B%"Pd"[join] pred(", block_id());
+  for (intptr_t i = 0; i < predecessors_.length(); ++i) {
+    if (i > 0) f->Print(", ");
+    f->Print("B%"Pd, predecessors_[i]->block_id());
+  }
+  f->Print(")");
   if (phis_ != NULL) {
     f->Print(" {");
     for (intptr_t i = 0; i < phis_->length(); ++i) {
       if ((*phis_)[i] == NULL) continue;
       f->Print("\n      ");
       (*phis_)[i]->PrintTo(f);
     }
     f->Print("\n}");
   }
   if (HasParallelMove()) {
     f->Print(" ");
     parallel_move()->PrintTo(f);
   }
 }
 
 
 void PhiInstr::PrintTo(BufferFormatter* f) const {
   f->Print("v%"Pd" <- 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(")");
   PrintPropagatedType(f, *this);
+  if (is_alive()) {
+    f->Print(" alive");
+  } else {
+    f->Print(" dead");
+  }
   if (range_ != NULL) {
     f->Print(" ");
     range_->PrintTo(f);
   }
 }
 
 
 void ParameterInstr::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%"Pd, index());
 }
@@ skipping 271 matching lines @@
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
   if (outer_ != NULL) outer_->PrintTo(f);
 }
 
 }  // namespace dart