Use GrowableObjectArray in ic-data.

vm/object.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/object.h"
 
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 5636 matching lines @@
     if ((start_offset <= offset) && (offset < end_offset)) {
       return false;
     }
   }
   return true;
 }
 
 
 void Code::ExtractIcDataArraysAtCalls(
     GrowableArray<intptr_t>* node_ids,
-    GrowableArray<const ICData*>* ic_data_objs) const {
+    const GrowableObjectArray& ic_data_objs) const {
   ASSERT(node_ids != NULL);
-  ASSERT(ic_data_objs != NULL);
+  ASSERT(!ic_data_objs.IsNull());
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(this->pc_descriptors());
+  ICData& ic_data_obj = ICData::Handle();
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.DescriptorKind(i) == PcDescriptors::kIcCall) {
       node_ids->Add(descriptors.NodeId(i));
-      ic_data_objs->Add(&ICData::ZoneHandle(
-          CodePatcher::GetInstanceCallIcDataAt(descriptors.PC(i))));
+      ic_data_obj = CodePatcher::GetInstanceCallIcDataAt(descriptors.PC(i));
+      ic_data_objs.Add(ic_data_obj);
     }
   }
 }
 
 
 RawContext* Context::New(intptr_t num_variables, Heap::Space space) {
   ASSERT(num_variables >= 0);
 
   const Class& context_class = Class::Handle(Object::context_class());
   Context& result = Context::Handle();
@@ skipping 3045 matching lines @@
     Class& cls = Class::ZoneHandle();
     cls ^= data.At(data_pos++);
     classes->Add(&cls);
   }
   (*target) ^= data.At(data_pos);
 }
 
 
 void ICData::GetOneClassCheckAt(
     int index, Class* cls, Function* target) const {
+  ASSERT(cls != NULL);
+  ASSERT(target != NULL);
   ASSERT(num_args_tested() == 1);
-  GrowableArray<const Class*> classes;
-  GetCheckAt(index, &classes, target);
-  *cls = classes[0]->raw();
+  const Array& data = Array::Handle(ic_data());
+  intptr_t data_pos = index * TestEntryLength();
+  *cls ^= data.At(data_pos);
+  *target ^= data.At(data_pos + 1);
 }
 
 
 RawICData* ICData::New(const Function& function,
                        const String& target_name,
                        intptr_t id,
                        intptr_t num_args_tested) {
   ASSERT(num_args_tested > 0);
   const Class& cls = Class::Handle(Object::icdata_class());
   ASSERT(!cls.IsNull());
   ICData& result = ICData::Handle();
   {
     // IC data objects ar long living objects, allocate them in old generation.
     RawObject* raw =
         Object::Allocate(cls, ICData::InstanceSize(), Heap::kOld);
     NoGCScope no_gc;
     result ^= raw;
   }
   result.set_function(function);
   result.set_target_name(target_name);
   result.set_id(id);
   result.set_num_args_tested(num_args_tested);
   // Number of array elements in one test entry (num_args_tested + 1)
   intptr_t len = result.TestEntryLength();
   // IC data array must be null terminated (sentinel entry).
-  Array& ic_data = Array::Handle(Array::New(len, Heap::kOld));
+  const Array& ic_data = Array::Handle(Array::New(len, Heap::kOld));
   result.set_ic_data(ic_data);
   return result.raw();
 }
 
 }  // namespace dart