Add support for fixed parameters in SSA builder and fix a bug in the pre-order graph traversal.

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 39 matching lines @@
         (current == NULL) ? NULL : current->AsBlockEntry();
     if (successor != NULL) {
       OS::Print(" goto %d", successor->block_id());
     }
     OS::Print("\n");
   }
 }
 
 
 void FlowGraphPrinter::PrintInstruction(Instruction* instr) {
-  char str[120];
+  char str[1000];
   BufferFormatter f(str, sizeof(str));
   instr->PrintTo(&f);
   if (FLAG_print_environments && (instr->env() != NULL)) {
     instr->env()->PrintTo(&f);
   }
   OS::Print("%s", str);
 }
 
 
 void FlowGraphPrinter::PrintComputation(Computation* comp) {
-  char str[120];
+  char str[1000];
   BufferFormatter f(str, sizeof(str));
   comp->PrintTo(&f);
   OS::Print("%s", str);
 }
 
 
 void Computation::PrintTo(BufferFormatter* f) const {
   f->Print("%s(", DebugName());
   PrintOperandsTo(f);
   f->Print(")");
@@ skipping 20 matching lines @@
 void ConstantVal::PrintTo(BufferFormatter* f) const {
   f->Print("#%s", value().ToCString());
 }
 
 
 void AssertAssignableComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
   f->Print(", %s, '%s'",
             String::Handle(dst_type().Name()).ToCString(),
             dst_name().ToCString());
-  f->Print(" (instantiator:");
+  f->Print(" instantiator(");
   instantiator()->PrintTo(f);
   f->Print(")");
-  f->Print(" (instantiator_type_arguments:");
+  f->Print(" instantiator_type_arguments(");
   instantiator_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void ClosureCallComp::PrintOperandsTo(BufferFormatter* f) const {
   for (intptr_t i = 0; i < ArgumentCount(); ++i) {
     if (i == 0) f->Print(", ");
     ArgumentAt(i)->PrintTo(f);
   }
@@ skipping 73 matching lines @@
   f->Print("%s, ", String::Handle(field().name()).ToCString());
   value()->PrintTo(f);
 }
 
 
 void InstanceOfComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
   f->Print(" %s %s",
             negate_result() ? "ISNOT" : "IS",
             String::Handle(type().Name()).ToCString());
-  f->Print(" (instantiator:");
+  f->Print(" instantiator(");
   instantiator()->PrintTo(f);
   f->Print(")");
-  f->Print(" (type-arg:");
+  f->Print(" type-arg(");
   instantiator_type_arguments()->PrintTo(f);
   f->Print(")");
 }
 
 
 void RelationalOpComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("%s, ", Token::Str(kind()));
   left()->PrintTo(f);
   f->Print(", ");
   right()->PrintTo(f);
@@ skipping 95 matching lines @@
 void ToDoubleComp::PrintOperandsTo(BufferFormatter* f) const {
   ASSERT(from() == kDouble || from() == kSmi);
   f->Print("%s ", from() == kDouble ? "double2double" : "smi2double");
   value()->PrintTo(f);
 }
 
 
 void GraphEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [graph]", block_id());
   if (start_env_ != NULL) {
-    for (intptr_t i = 0; i < start_env_->length(); ++i) {
-      f->Print("\n  ");
-      (*start_env_)[i]->PrintTo(f);
-    }
+    start_env_->PrintTo(f);
   }
 }
 
 
 void JoinEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [join]", block_id());
   if (phis_ != NULL) {
     for (intptr_t i = 0; i < phis_->length(); ++i) {
       if ((*phis_)[i] == NULL) continue;
       f->Print("\n");
       (*phis_)[i]->PrintTo(f);
     }
   }
 }
 
 
 void PhiInstr::PrintTo(BufferFormatter* f) const {
   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());
+}
+
+
 void TargetEntryInstr::PrintTo(BufferFormatter* f) const {
   f->Print("%2d: [target", block_id());
   if (HasTryIndex()) {
     f->Print(" catch %d]", try_index());
   } else {
     f->Print("]");
   }
 }
 
 
@@ skipping 48 matching lines @@
             false_successor()->block_id());
 }
 
 
 void ParallelMoveInstr::PrintTo(BufferFormatter* f) const {
   UNIMPLEMENTED();
 }
 
 
 void FlowGraphVisualizer::Print(const char* format, ...) {
-  char str[120];
+  char str[1000];
   BufferFormatter f(str, sizeof(str));
   f.Print("%*s", 2 * indent_, "");
   va_list args;
   va_start(args, format);
   f.VPrint(format, args);
   va_end(args);
   (*Dart::flow_graph_writer())(str, strlen(str));
 }
 
 
 void FlowGraphVisualizer::PrintInstruction(Instruction* instr) {
-  char str[120];
+  char str[1000];
   BufferFormatter f(str, sizeof(str));
   instr->PrintToVisualizer(&f);
   if (FLAG_print_environments && (instr->env() != NULL)) {
     instr->env()->PrintTo(&f);
   }
   f.Print(" <|@\n");
   (*Dart::flow_graph_writer())(str, strlen(str));
 }
 
 
@@ skipping 104 matching lines @@
 #undef BEGIN
 #undef END
 }
 
 
 // === Printing instructions in a visualizer-understandable format:
 // "result instruction(op1, op2)" where result is a temporary name
 // or _ for instruction without result.
 void GraphEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [graph]");
+  if (start_env_ != NULL) {
+    start_env_->PrintTo(f);
+  }
 }
 
 
 void JoinEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [join]");
 }
 
 
 void PhiInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("v%d [", ssa_temp_index());
@@ skipping 16 matching lines @@
       if (i > 0) f->Print(" ");
       if (InputAt(i)->IsConstant()) {
         InputAt(i)->PrintTo(f);
       }
     }
     f->Print("\"");
   }
 }
 
 
+void ParameterInstr::PrintToVisualizer(BufferFormatter* f) const {
+  ASSERT(ssa_temp_index() != -1);
+  ASSERT(temp_index() == -1);
+  f->Print("v%d Parameter(%d)", ssa_temp_index(), index());
+}
+
+
 void TargetEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [target");
   if (HasTryIndex()) {
     f->Print(" catch %d]", try_index());
   } else {
     f->Print("]");
   }
 }
 
 
@@ skipping 51 matching lines @@
 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);
   }
   f->Print(" }");
 }
 
 }  // namespace dart