Store IC data instead of array of classes in AST node, so that we can easier access targets and f...

runtime/vm/object.cc

 // Copyright (c) 2011, 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 "vm/assembler.h"
 #include "vm/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
@@ skipping 4409 matching lines @@
   for (intptr_t i = 0; i < this->pointer_offsets_length(); i++) {
     const intptr_t offset = this->GetPointerOffsetAt(i);
     if ((start_offset <= offset) && (offset < end_offset)) {
       return false;
     }
   }
   return true;
 }
 
 
-void Code::ExtractTypesAtIcCalls(
+void Code::ExtractIcDataArraysAtCalls(
     GrowableArray<intptr_t>* node_ids,
-    GrowableArray<ZoneGrowableArray<const Class*>*>* type_arrays) const {
+    GrowableArray<const Array*>* arrays) const {
   ASSERT(node_ids != NULL);
-  ASSERT(type_arrays != NULL);
+  ASSERT(arrays != NULL);
   const PcDescriptors& descriptors =
       PcDescriptors::Handle(this->pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.DescriptorKind(i) == PcDescriptors::kIcCall) {
-      ICData ic_data(Array::Handle(
+      node_ids->Add(descriptors.NodeId(i));
+      arrays->Add(&Array::ZoneHandle(
           CodePatcher::GetInstanceCallIcDataAt(descriptors.PC(i))));
-      ASSERT(ic_data.NumberOfArgumentsChecked() == 1);
-      int len = ic_data.NumberOfChecks();
-      ZoneGrowableArray<const Class*>* types =
-          new ZoneGrowableArray<const Class*>();
-      Function& target = Function::Handle();
-      for (intptr_t k = 0; k < len; k++) {
-        GrowableArray<const Class*> classes;
-        ic_data.GetCheckAt(k, &classes, &target);
-        ASSERT(classes.length() == 1);
-        types->Add(classes[0]);
-      }
-      node_ids->Add(descriptors.NodeId(i));
-      type_arrays->Add(types);
     }
   }
 }
 
 
 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 2327 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart