Restoring assert that deopt_id() should be accessed only if the instruction can deoptimize. Print r…

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 41 matching lines @@
     if (current->next() != NULL) {
       ASSERT(current->next()->IsBlockEntry());
       OS::Print(" goto %"Pd"", current->next()->AsBlockEntry()->block_id());
     }
     OS::Print("\n");
   }
 }
 
 
 void FlowGraphPrinter::PrintInstruction(Instruction* instr) {
+  PrintOneInstruction(instr, print_locations_);
+}
+
+
+void FlowGraphPrinter::PrintOneInstruction(Instruction* instr,
+                                           bool print_locations) {
   char str[1000];
   BufferFormatter f(str, sizeof(str));
   instr->PrintTo(&f);
   if (FLAG_print_environments && (instr->env() != NULL)) {
     instr->env()->PrintTo(&f);
   }
-  if (print_locations_ && (instr->locs() != NULL)) {
+  if (print_locations && (instr->locs() != NULL)) {
     instr->locs()->PrintTo(&f);
   }
   if (instr->lifetime_position() != -1) {
     OS::Print("%3"Pd": ", instr->lifetime_position());
   }
   OS::Print("%s", str);
 }
 
 
 void FlowGraphPrinter::PrintTypeCheck(const ParsedFunction& parsed_function,
@@ skipping 39 matching lines @@
       f->Print("%s", String::Handle(cls.Name()).ToCString());
     }
   }
   f->Print("]");
 }
 
 
 void Definition::PrintTo(BufferFormatter* f) const {
   // Do not access 'deopt_id()' as it asserts that the computation can
   // deoptimize.
-  f->Print("%s:%"Pd"(", DebugName(), deopt_id());
+  if (HasSSATemp()) {
+    f->Print("v%"Pd" <- ", ssa_temp_index());
+  }
+  f->Print("%s:%"Pd"(", DebugName(), deopt_id_);
   PrintOperandsTo(f);
   f->Print(")");
 }
 
 
 void Definition::PrintOperandsTo(BufferFormatter* f) const {
   for (int i = 0; i < InputCount(); ++i) {
     if (i > 0) f->Print(", ");
     if (InputAt(i) != NULL) InputAt(i)->PrintTo(f);
   }
@@ skipping 325 matching lines @@
   }
   if (def.has_propagated_cid()) {
     const Class& cls = Class::Handle(
         Isolate::Current()->class_table()->At(def.propagated_cid()));
     f->Print(" {PCid: %s}", String::Handle(cls.Name()).ToCString());
   }
 }
 
 
 void PhiInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    v%"Pd" <- phi(", ssa_temp_index());
+  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);
 }
 
 
 void ParameterInstr::PrintTo(BufferFormatter* f) const {
@@ skipping 18 matching lines @@
 }
 
 
 void PushArgumentInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
 void ReturnInstr::PrintTo(BufferFormatter* f) const {
-  f->Print("    %s:%"Pd" ", DebugName(), deopt_id());
+  f->Print("    %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
 void ThrowInstr::PrintTo(BufferFormatter* f) const {
   f->Print("    %s" , DebugName());
 }
 
 
 void ReThrowInstr::PrintTo(BufferFormatter* f) const {
@@ skipping 209 matching lines @@
 }
 
 
 void PushArgumentInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
 void ReturnInstr::PrintToVisualizer(BufferFormatter* f) const {
-  f->Print("_ %s:%"Pd" ", DebugName(), deopt_id());
+  f->Print("_ %s ", DebugName());
   value()->PrintTo(f);
 }
 
 
 void ThrowInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ %s ", DebugName());
 }
 
 
 void ReThrowInstr::PrintToVisualizer(BufferFormatter* f) const {
@@ skipping 29 matching lines @@
     if ((locations_ != NULL) && !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart