Allocate the environment's location backing store during register allocation.

runtime/vm/intermediate_language.h

 // 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.
 
 #ifndef VM_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 2660 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BranchInstr);
 };
 
 
 #undef DECLARE_INSTRUCTION
 
 
 class Environment : public ZoneAllocated {
  public:
   // Construct an environment by copying from an array of values.
-  // TODO(vegorov): it's absolutely crucial that locations_ backing store
-  // is preallocated and never reallocated.  We use pointers into it
-  // during register allocation.
   explicit Environment(const GrowableArray<Value*>& values,
                        intptr_t fixed_parameter_count)
       : values_(values.length()),
-        locations_(values.length()),
+        location_count_(0),
+        locations_(NULL),
         fixed_parameter_count_(fixed_parameter_count) {
     values_.AddArray(values);
   }
 
   const GrowableArray<Value*>& values() const {
     return values_;
   }
 
-  void AddLocation(Location value) {
-    locations_.Add(value);
+  void InitializeLocations() {
+    location_count_ = values_.length();

[srdjan, 2012/08/06 22:49:25]

ASSERT(locations_ == NULL), guaranteeing that we do not reallocate locations_ as
we use pointers into it (add that as comment as well).

+    if (location_count_ > 0) {
+      locations_ =
+          Isolate::Current()->current_zone()->Alloc<Location>(location_count_);

[srdjan, 2012/08/06 22:49:25]

Please initialize locations_ with default Location values.

+    }
   }
 
   Location LocationAt(intptr_t ix) const {
+    ASSERT((ix >= 0) && (ix < location_count_));

[srdjan, 2012/08/06 22:49:25]

ASSERT(locations_ != NULL) .

     return locations_[ix];
   }
 
   Location* LocationSlotAt(intptr_t ix) const {
-    return & locations_[ix];
+    ASSERT((ix >= 0) && (ix < location_count_));

[srdjan, 2012/08/06 22:49:25]

ditto

+    return &locations_[ix];
   }
 
   intptr_t fixed_parameter_count() const {
     return fixed_parameter_count_;
   }
 
   void PrintTo(BufferFormatter* f) const;
 
  private:
   GrowableArray<Value*> values_;
-  GrowableArray<Location> locations_;
+  intptr_t location_count_;
+  Location* locations_;
   const intptr_t fixed_parameter_count_;
 
   DISALLOW_COPY_AND_ASSIGN(Environment);
 };
 
 
 // Visitor base class to visit each instruction and computation in a flow
 // graph as defined by a reversed list of basic blocks.
 class FlowGraphVisitor : public ValueObject {
  public:
@@ skipping 23 matching lines @@
   const GrowableArray<BlockEntryInstr*>& block_order_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_