- Make RawICData a subclass of RawObject and not RawInstance.

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 138 matching lines @@
     kScriptClass,
     kLibraryClass,
     kLibraryPrefixClass,
     kCodeClass,
     kInstructionsClass,
     kPcDescriptorsClass,
     kLocalVarDescriptorsClass,
     kExceptionHandlersClass,
     kContextClass,
     kContextScopeClass,
+    kICDataClass,
     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 223 matching lines @@
   static RawClass* script_class_;  // Class of the Script vm object.
   static RawClass* library_class_;  // Class of the Library vm object.
   static RawClass* library_prefix_class_;  // Class of Library prefix vm object.
   static RawClass* code_class_;  // Class of the Code vm object.
   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* icdata_class_;  // Class of ICData.
   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 1924 matching lines @@
     raw_addr += sizeof(RawContextScope) +
         (index * sizeof(RawContextScope::VariableDesc));
     return reinterpret_cast<RawContextScope::VariableDesc*>(raw_addr);
   }
 
   HEAP_OBJECT_IMPLEMENTATION(ContextScope, Object);
   friend class Class;
 };
 
 
+// Object holding information about an IC: test classes and their
+// corresponding classes.
+class ICData : public Object {
+ public:
+  RawFunction* function() const {
+    return raw_ptr()->function_;
+  }
+
+  RawString* target_name() const {
+    return raw_ptr()->target_name_;
+  }
+
+  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_);
+  }
+
+  static intptr_t function_offset() {
+    return OFFSET_OF(RawICData, function_);
+  }
+
+  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;
+
+  static RawICData* New(const Function& caller_function,
+                        const String& target_name,
+                        intptr_t id,
+                        intptr_t num_args_tested);
+
+ private:
+  RawArray* ic_data() const {
+    return raw_ptr()->ic_data_;
+  }
+
+  void set_function(const Function& value) const;
+  void set_target_name(const String& value) const;
+  void set_id(intptr_t value) const;
+  void set_num_args_tested(intptr_t value) const;
+  void set_ic_data(const Array& value) const;
+
+  intptr_t TestEntryLength() const;
+
+  HEAP_OBJECT_IMPLEMENTATION(ICData, Object);
+  friend class Class;
+};
+
+
 class Error : public Object {
  public:
   virtual const char* ToErrorCString() const;
 
  private:
   HEAP_OBJECT_IMPLEMENTATION(Error, Object);
 };
 
 
 class ApiError : public Error {
@@ skipping 1414 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:
-  RawFunction* function() const {
-    return raw_ptr()->function_;
-  }
-
-  RawString* target_name() const {
-    return raw_ptr()->target_name_;
-  }
-
-  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_);
-  }
-
-  static intptr_t function_offset() {
-    return OFFSET_OF(RawICData, function_);
-  }
-
-  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;
-
-  static RawICData* New(const Function& caller_function,
-                        const String& target_name,
-                        intptr_t id,
-                        intptr_t num_args_tested);
-
- private:
-  RawArray* ic_data() const {
-    return raw_ptr()->ic_data_;
-  }
-
-  void set_function(const Function& value) const;
-  void set_target_name(const String& value) const;
-  void set_id(intptr_t value) const;
-  void set_num_args_tested(intptr_t value) const;
-  void set_ic_data(const Array& value) 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 54 matching lines @@
 }
 
 
 void Context::SetAt(intptr_t index, const Instance& value) const {
   StorePointer(InstanceAddr(index), value.raw());
 }
 
 }  // namespace dart
 
 #endif  // VM_OBJECT_H_