First part of new ICData infrastructure: use a wrapper object instead of an array.

runtime/vm/object.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_OBJECT_H_
 #define VM_OBJECT_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/utils.h"
@@ skipping 141 matching lines @@
     kInstructionsClass,
     kPcDescriptorsClass,
     kLocalVarDescriptorsClass,
     kExceptionHandlersClass,
     kContextClass,
     kContextScopeClass,
     kApiErrorClass,
     kLanguageErrorClass,
     kUnhandledExceptionClass,
     kUnwindErrorClass,
+    kICDataClass,
     kMaxId,
     kInvalidIndex = -1,
   };
 
   virtual ~Object() { }
 
   RawObject* raw() const { return raw_; }
   void operator=(RawObject* value) { SetRaw(value); }
 
   void set_tags(intptr_t value) const {
@@ skipping 118 matching lines @@
     return exception_handlers_class_;
   }
   static RawClass* context_class() { return context_class_; }
   static RawClass* context_scope_class() { return context_scope_class_; }
   static RawClass* api_error_class() { return api_error_class_; }
   static RawClass* language_error_class() { return language_error_class_; }
   static RawClass* unhandled_exception_class() {
     return unhandled_exception_class_;
   }
   static RawClass* unwind_error_class() { return unwind_error_class_; }
+  static RawClass* icdata_class() { return icdata_class_; }
 
   static int GetSingletonClassIndex(const RawClass* raw_class);
   static RawClass* GetSingletonClass(int index);
   static const char* GetSingletonClassName(int index);
 
   static RawClass* CreateAndRegisterInterface(const char* cname,
                                               const Script& script,
                                               const Library& lib);
   static void RegisterClass(const Class& cls,
                             const char* cname,
@@ skipping 86 matching lines @@
   static RawClass* instructions_class_;  // Class of the Instructions vm object.
   static RawClass* pc_descriptors_class_;  // Class of PcDescriptors vm object.
   static RawClass* var_descriptors_class_;  // Class of LocalVarDescriptors.
   static RawClass* exception_handlers_class_;  // Class of ExceptionHandlers.
   static RawClass* context_class_;  // Class of the Context vm object.
   static RawClass* context_scope_class_;  // Class of ContextScope vm object.
   static RawClass* api_error_class_;  // Class of ApiError.
   static RawClass* language_error_class_;  // Class of LanguageError.
   static RawClass* unhandled_exception_class_;  // Class of UnhandledException.
   static RawClass* unwind_error_class_;  // Class of UnwindError.
+  static RawClass* icdata_class_;  // Class of ICData.
 
   friend void RawObject::Validate() const;
   friend class SnapshotReader;
 
   // Disallow allocation.
   void* operator new(size_t size);
   // Disallow copy constructor.
   DISALLOW_COPY_AND_ASSIGN(Object);
 };
 
@@ skipping 1662 matching lines @@
     StorePointer(&raw_ptr()->pc_descriptors_, descriptors.raw());
   }
 
   RawLocalVarDescriptors* var_descriptors() const {
     return raw_ptr()->var_descriptors_;
   }
   void set_var_descriptors(const LocalVarDescriptors& value) const {
     StorePointer(&raw_ptr()->var_descriptors_, value.raw());
   }
 
-  // See class ICData for interpretation of the 'ic_data_' array.
-  RawArray* ic_data() const;
-  void set_ic_data(const Array& ic_data) const;
-
   RawExceptionHandlers* exception_handlers() const {
     return raw_ptr()->exception_handlers_;
   }
   void set_exception_handlers(const ExceptionHandlers& handlers) const {
     StorePointer(&raw_ptr()->exception_handlers_, handlers.raw());
   }
 
   RawFunction* function() const {
     return raw_ptr()->function_;
   }
@@ skipping 22 matching lines @@
   // Find pc of patch code buffer. Return 0 if not found.
   uword GetPatchCodePc() const;
 
   uword GetDeoptPcAtNodeId(intptr_t node_id) const;
 
   // Returns true if there is an object in the code between 'start_offset'
   // (inclusive) and 'end_offset' (exclusive).
   bool ObjectExistInArea(intptr_t start_offest, intptr_t end_offset) const;
 
   // Each (*node_ids)[n] has a an extracted ic data array (*arrays)[n].
-  void ExtractIcDataArraysAtCalls(GrowableArray<intptr_t>* node_ids,
-                                  GrowableArray<const Array*>* arrays) const;
+  void ExtractIcDataArraysAtCalls(
+      GrowableArray<intptr_t>* node_ids,
+      GrowableArray<const ICData*>* ic_data_objs) const;
 
  private:
   static const intptr_t kEntrySize = sizeof(int32_t);  // NOLINT
 
   void set_instructions(RawInstructions* instructions) {
     raw_ptr()->instructions_ = instructions;
   }
   void set_pointer_offsets_length(intptr_t value) {
     ASSERT(value >= 0);
     raw_ptr()->pointer_offsets_length_ = value;
@@ skipping 1459 matching lines @@
     // This is only safe because we create a new Smi, which does not cause
     // heap allocation.
     raw_ptr()->data_length_ = Smi::New(value);
   }
 
   HEAP_OBJECT_IMPLEMENTATION(JSRegExp, Instance);
   friend class Class;
 };
 
 
+// Object holding information about an IC: test classes and their
+// corresponding classes.
+class ICData : public Instance {
+ public:
+  static RawICData* New(const Function& caller_function,
+                        const String& target_name,
+                        intptr_t id,
+                        intptr_t num_args_tested);

[regis, 2012/02/21 21:51:34]

We usually list the New method last, just before the private section.

[srdjan, 2012/02/22 14:59:45]

Done.

+
+  RawFunction* function() const {
+    return raw_ptr()->function_;
+  }
+
+  RawString* target_name() const {
+    return raw_ptr()->target_name_;
+  }
+
+  RawArray* ic_data() const {
+    return raw_ptr()->ic_data_;
+  }
+
+  intptr_t num_args_tested() const {
+    return raw_ptr()->num_args_tested_;
+  }
+
+  intptr_t id() const {
+    return raw_ptr()->id_;
+  }
+
+  intptr_t NumberOfChecks() const;
+
+  static intptr_t InstanceSize() {
+    return RoundedAllocationSize(sizeof(RawICData));
+  }
+
+  static intptr_t target_name_offset() {
+    return OFFSET_OF(RawICData, target_name_);
+  }
+
+  static intptr_t num_args_tested_offset() {
+    return OFFSET_OF(RawICData, num_args_tested_);
+  }
+
+  static intptr_t ic_data_offset() {
+    return OFFSET_OF(RawICData, ic_data_);
+  }
+
+  void AddCheck(const GrowableArray<const Class*>& classes,
+                const Function& target) const;
+  void GetCheckAt(intptr_t index,
+                  GrowableArray<const Class*>* classes,
+                  Function* target) const;
+  void GetOneClassCheckAt(int index, Class* cls, Function* target) const;
+
+ private:

[regis, 2012/02/21 21:51:34]

Many classes just use "value" as the formal parameter name in setters. But not
all of them, so I do not really care.

[srdjan, 2012/02/22 14:59:45]

Changing to value

+  void set_function(const Function& function) const;
+  void set_target_name(const String& target_name) const;
+  void set_id(intptr_t id) const;
+  void set_num_args_tested(intptr_t num_args_tested) const;
+  void set_ic_data(const Array& array) const;
+
+  intptr_t TestEntryLength() const;
+
+  HEAP_OBJECT_IMPLEMENTATION(ICData, Instance);
+  friend class Class;
+};
+
+
 // Breaking cycles and loops.
 RawClass* Object::clazz() const {
   uword raw_value = reinterpret_cast<uword>(raw_);
   if ((raw_value & kSmiTagMask) == kSmiTag) {
     return Smi::Class();
   }
   return raw_->ptr()->class_;
 }
 
 
@@ skipping 45 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_