Reapply "Remove classes Computation and BindInstr."

runtime/vm/locations.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/locations.h"
 
 #include "vm/il_printer.h"
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph_compiler.h"
 
@@ skipping 28 matching lines @@
   LocationSummary* summary = new LocationSummary(input_count, 0, contains_call);
   for (intptr_t i = 0; i < input_count; i++) {
     summary->set_in(i, Location::RequiresRegister());
   }
   summary->set_out(out);
   return summary;
 }
 
 
 Location Location::RegisterOrConstant(Value* value) {
-  ConstantComp* constant = value->definition()->AsConstant();
+  ConstantInstr* constant = value->definition()->AsConstant();
   return (constant != NULL)
       ? Location::Constant(constant->value())
       : Location::RequiresRegister();
 }
 
 
 Location Location::FixedRegisterOrConstant(Value* value, Register reg) {
-  ConstantComp* constant = value->definition()->AsConstant();
+  ConstantInstr* constant = value->definition()->AsConstant();
   return (constant != NULL)
       ? Location::Constant(constant->value())
       : Location::RegisterLocation(reg);
 }
 
 
 const char* Location::Name() const {
   switch (kind()) {
     case kInvalid: return "?";
     case kRegister: return Assembler::RegisterName(reg());
@@ skipping 63 matching lines @@
 
   if (!out().IsInvalid()) {
     f->Print(" => ");
     out().PrintTo(f);
   }
 
   if (always_calls()) f->Print(" C");
 }
 
 }  // namespace dart