Add higher-level accesses to Environment. Print flow graph after register allocation. Most interest…

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 452 matching lines @@
           const bool use_at_end = (j > 0) || (in_ref == NULL) ||
             !output_same_as_first_input;
           UseValue(current, block->start_pos(), pos, use, in_ref, use_at_end);
         }
       }
 
       // Add uses from the deoptimization environment.
       // TODO(vegorov): these uses should _not_ require register but for now
       // they do because we don't support spilling at all.
       if (current->env() != NULL) {
-        const GrowableArray<Value*>& values = current->env()->values();
-        GrowableArray<Location>* locations = current->env()->locations();
+        Environment* env = current->env();
+        const GrowableArray<Value*>& values = env->values();
 
         for (intptr_t j = 0; j < values.length(); j++) {
           Value* val = values[j];
           if (val->IsUse()) {
-            locations->Add(Location::RequiresRegister());
+            env->AddLocation(Location::RequiresRegister());
             const intptr_t use = val->AsUse()->definition()->ssa_temp_index();
             UseValue(current,
                      block->start_pos(),
                      pos,
                      use,
-                     &(*locations)[j],
+                     env->LocationSlotAt(j),
                      true);
           } else {
-            locations->Add(Location::NoLocation());
+            env->AddLocation(Location::NoLocation());
           }
         }
       }
 
       // Process temps.
       for (intptr_t j = 0; j < locs->temp_count(); j++) {
         Location temp = locs->temp(j);
         if (temp.IsRegister()) {
           BlockLocation(temp, pos);
         } else if (temp.IsUnallocated()) {
           UseInterval* temp_interval = new UseInterval(
-            kTempVirtualRegister, pos, pos + 1, NULL);
+              kTempVirtualRegister, pos, pos + 1, NULL);
           temp_interval->AddUse(NULL, pos, locs->temp_slot(j));
           AddToUnallocated(temp_interval);
         } else {
           UNREACHABLE();
         }
       }
 
       // Block all allocatable registers for calls.
       if (locs->is_call()) {
         for (intptr_t reg = 0; reg < kNumberOfCpuRegisters; reg++) {
@@ skipping 437 matching lines @@
 
   if (FLAG_trace_ssa_allocator) {
     OS::Print("-- ir after allocation -------------------------\n");
     FlowGraphPrinter printer(Function::Handle(), block_order_, true);
     printer.PrintBlocks();
   }
 }
 
 
 }  // namespace dart