Make constants computations instead of values.

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 139 matching lines @@
 
 void UseVal::PrintTo(BufferFormatter* f) const {
   if (definition()->HasSSATemp()) {
     f->Print("v%d", definition()->ssa_temp_index());
   } else {
     f->Print("t%d", definition()->temp_index());
   }
 }
 
 
-void ConstantVal::PrintTo(BufferFormatter* f) const {
+void ConstantComp::PrintOperandsTo(BufferFormatter* f) const {
   f->Print("#%s", value().ToCString());
 }
 
 
-void MaterializeComp::PrintOperandsTo(BufferFormatter* f) const {
-  constant_val()->PrintTo(f);
-}
-
-
 void AssertAssignableComp::PrintOperandsTo(BufferFormatter* f) const {
   value()->PrintTo(f);
   f->Print(", %s, '%s'%s",
            String::Handle(dst_type().Name()).ToCString(),
            dst_name().ToCString(),
            is_eliminated() ? " eliminated" : "");
   f->Print(" instantiator(");
   instantiator()->PrintTo(f);
   f->Print(")");
   f->Print(" instantiator_type_arguments(");
@@ skipping 556 matching lines @@
 }
 
 
 void JoinEntryInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("_ [join]");
 }
 
 
 void PhiInstr::PrintToVisualizer(BufferFormatter* f) const {
   f->Print("v%d [", ssa_temp_index());
-  bool has_constant = false;
   for (intptr_t i = 0; i < InputCount(); ++i) {
     if (i > 0) f->Print(" ");
-    if (InputAt(i)->IsConstant()) {
-      f->Print("const");
-      has_constant = true;
-    } else {
-      InputAt(i)->PrintTo(f);
-    }
+    InputAt(i)->PrintTo(f);
   }
   f->Print("]");
-  // The vizualizer file format does not allow arbitrary strings inside the phi.
-  // Print constants as a line-end comment instead.
-  if (has_constant) {
-    f->Print("\"");
-    for (intptr_t i = 0; i < InputCount(); ++i) {
-      if (i > 0) f->Print(" ");
-      if (InputAt(i)->IsConstant()) {
-        InputAt(i)->PrintTo(f);
-      }
-    }
-    f->Print("\"");
-  }
 }
 
 
 void ParameterInstr::PrintToVisualizer(BufferFormatter* f) const {
   ASSERT(HasSSATemp());
   ASSERT(temp_index() == -1);
   f->Print("v%d Parameter(%d)", ssa_temp_index(), index());
 }
 
 
@@ skipping 83 matching lines @@
     if ((locations_ != NULL) && !locations_[i].IsInvalid()) {
       f->Print(" [");
       locations_[i].PrintTo(f);
       f->Print("]");
     }
   }
   f->Print(" }");
 }
 
 }  // namespace dart