Move all register allocator environment initialization into class Environment.

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_builder.h"
@@ skipping 633 matching lines @@
       (locs->out().policy() == Location::kSameAsFirstInput) &&
       (locs->in(0).IsRegister())) {
     locs->set_out(locs->in(0));
   }
 
   const bool output_same_as_first_input =
       locs->out().IsUnallocated() &&
       (locs->out().policy() == Location::kSameAsFirstInput);
 
   // Add uses from the deoptimization environment.
-  if (current->env() != NULL) {
-    // Any value mentioned in the deoptimization environment should survive
-    // until the end of instruction but it does not need to be in the register.
-    // Expected shape of live range:
-    //
-    //                 i  i'
-    //      value    -----*
-    //
-
-    Environment* env = current->env();
-    const GrowableArray<Value*>& values = env->values();
-    env->InitializeLocations();
-    for (intptr_t j = 0; j < values.length(); j++) {
-      Value* val = values[j];
-      Location* loc = env->LocationSlotAt(j);
-      if (val->IsUse()) {
-        *loc = Location::Any();
-        const intptr_t vreg = val->AsUse()->definition()->ssa_temp_index();
-
-        LiveRange* range = GetLiveRange(vreg);
-        range->AddUseInterval(block->start_pos(), pos + 1);
-        range->AddUse(pos + 1, loc);
-      } else {
-        ASSERT(val->IsConstant());
-        *loc = Location::NoLocation();
-      }
-    }
+  Environment* env = current->env();
+  if (env != NULL) {
+    env->InitializeLocations(this, block->start_pos(), pos + 1);
   }
 
   // Process inputs.
   // Skip the first input if output is specified with kSameAsFirstInput policy,
   // they will be processed together at the very end.
   for (intptr_t j = output_same_as_first_input ? 1 : 0;
        j < current->InputCount();
        j++) {
     Value* input = current->InputAt(j);
     ASSERT(input->IsUse());  // Can not be a constant currently.
@@ skipping 1192 matching lines @@
     OS::Print("-- [after ssa allocator] ir [%s] -------------\n",
               function.ToFullyQualifiedCString());
     FlowGraphPrinter printer(Function::Handle(), block_order_, true);
     printer.PrintBlocks();
     OS::Print("----------------------------------------------\n");
   }
 }
 
 
 }  // namespace dart