Reapply "Remove classes Computation and BindInstr."

runtime/vm/flow_graph_allocator.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/flow_graph_allocator.h"
 
 #include "vm/bit_vector.h"
 #include "vm/intermediate_language.h"
 #include "vm/il_printer.h"
 #include "vm/flow_graph.h"
@@ skipping 68 matching lines @@
   blocked_cpu_registers_[FPREG] = true;
 
   // XMM0 is used as scratch by optimized code and parallel move resolver.
   blocked_xmm_registers_[XMM0] = true;
 }
 
 
 // Remove environments from the instructions which can't deoptimize.
 // Replace dead phis uses with null values in environments.
 void FlowGraphAllocator::EliminateEnvironmentUses() {
-  Definition* constant_null =
+  ConstantInstr* constant_null =
       postorder_.Last()->AsGraphEntry()->constant_null();
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     BlockEntryInstr* block = block_order_[i];
     if (block->IsJoinEntry()) block->AsJoinEntry()->RemoveDeadPhis();
     for (ForwardInstructionIterator it(block); !it.Done(); it.Advance()) {
       Instruction* current = it.Current();
       if (current->CanDeoptimize()) {
         ASSERT(current->env() != NULL);
         GrowableArray<Value*>* values = current->env()->values_ptr();
         for (intptr_t i = 0; i < values->length(); i++) {
@@ skipping 456 matching lines @@
       // All incoming parameters are tagged.
       CompleteRange(tail, Location::kRegister);
     }
     ConvertAllUses(range);
     if (flow_graph_.copied_parameter_count() > 0) {
       MarkAsObjectAtSafepoints(range);
     }
   }
 
   // Process global constants.
-  BindInstr* null_defn = graph_entry->constant_null()->AsBind();
+  ConstantInstr* null_defn = graph_entry->constant_null();
   LiveRange* range = GetLiveRange(null_defn->ssa_temp_index());
   range->AddUseInterval(graph_entry->start_pos(), graph_entry->end_pos());
   range->DefineAt(graph_entry->start_pos());
-  range->set_assigned_location(
-      Location::Constant(null_defn->computation()->AsConstant()->value()));
-  range->set_spill_slot(
-      Location::Constant(null_defn->computation()->AsConstant()->value()));
+  range->set_assigned_location(Location::Constant(null_defn->value()));
+  range->set_spill_slot(Location::Constant(null_defn->value()));
   range->finger()->Initialize(range);
   UsePosition* use =
       range->finger()->FirstRegisterBeneficialUse(graph_entry->start_pos());
   if (use != NULL) {
     LiveRange* tail = SplitBetween(range, graph_entry->start_pos(), use->pos());
     CompleteRange(tail, Location::kRegister);
   }
   ConvertAllUses(range);
 }
 
@@ skipping 171 matching lines @@
     Value* value = values[i];
     locations[i] = Location::Any();
     Definition* def = value->definition();
 
     if (def->IsPushArgument()) {
       // Frame size is unknown until after allocation.
       locations[i] = Location::NoLocation();
       continue;
     }
 
-    ConstantComp* constant = def->AsConstant();
+    ConstantInstr* constant = def->AsConstant();
     if (constant != NULL) {
       locations[i] = Location::Constant(constant->value());
       continue;
     }
 
     const intptr_t vreg = def->ssa_temp_index();
     LiveRange* range = GetLiveRange(vreg);
     range->AddUseInterval(block_start_pos, use_pos);
     range->AddUse(use_pos, &locations[i]);
   }
@@ skipping 1398 matching lines @@
     OS::Print("-- [after ssa allocator] ir [%s] -------------\n",
               function.ToFullyQualifiedCString());
     FlowGraphPrinter printer(flow_graph_, true);
     printer.PrintBlocks();
     OS::Print("----------------------------------------------\n");
   }
 }
 
 
 }  // namespace dart