- Make RawICData a subclass of RawObject and not RawInstance.

vm/raw_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_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/token.h"
@@ skipping 21 matching lines @@
   V(Script)                                                                    \
   V(Library)                                                                   \
   V(LibraryPrefix)                                                             \
   V(Code)                                                                      \
   V(Instructions)                                                              \
   V(PcDescriptors)                                                             \
   V(LocalVarDescriptors)                                                       \
   V(ExceptionHandlers)                                                         \
   V(Context)                                                                   \
   V(ContextScope)                                                              \
+  V(ICData)                                                                    \
   V(Error)                                                                     \
     V(ApiError)                                                                \
     V(LanguageError)                                                           \
     V(UnhandledException)                                                      \
     V(UnwindError)                                                             \
   V(Instance)                                                                  \
     V(Number)                                                                  \
       V(Integer)                                                               \
         V(Smi)                                                                 \
         V(Mint)                                                                \
         V(Bigint)                                                              \
       V(Double)                                                                \
     V(String)                                                                  \
       V(OneByteString)                                                         \
       V(TwoByteString)                                                         \
       V(FourByteString)                                                        \
       V(ExternalOneByteString)                                                 \
       V(ExternalTwoByteString)                                                 \
       V(ExternalFourByteString)                                                \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     V(GrowableObjectArray)                                                     \
     V(ByteArray)                                                               \
       V(InternalByteArray)                                                     \
       V(ExternalByteArray)                                                     \
     V(Closure)                                                                 \
     V(Stacktrace)                                                              \
     V(JSRegExp)                                                                \
-    V(ICData)                                                                  \
 
 #define CLASS_LIST(V)                                                          \
   V(Object)                                                                    \
   CLASS_LIST_NO_OBJECT(V)
 
 
 // Forward declarations.
 class Isolate;
 #define DEFINE_FORWARD_DECLARATION(clazz)                                      \
   class Raw##clazz;
@@ skipping 671 matching lines @@
   // Variable length data follows here.
   RawObject** from() { return reinterpret_cast<RawObject**>(&ptr()->data_[0]); }
   RawObject* data_[0];
   RawObject** to(intptr_t num_vars) {
     intptr_t data_length = num_vars * (sizeof(VariableDesc)/kWordSize);
     return reinterpret_cast<RawObject**>(&ptr()->data_[data_length - 1]);
   }
 };
 
 
+class RawICData : public RawObject {
+  RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
+
+  RawObject** from() {
+    return reinterpret_cast<RawObject**>(&ptr()->function_);
+  }
+  RawFunction* function_;  // Parent/calling function of this IC.
+  RawString* target_name_;  // Name of target function.
+  RawArray* ic_data_;  // Contains test classes and target function.
+  RawObject** to() {
+    return reinterpret_cast<RawObject**>(&ptr()->ic_data_);
+  }
+  intptr_t id_;  // Parser node id corresponding to this IC.
+  intptr_t num_args_tested_;  // Number of arguments tested in IC.
+};
+
+
 class RawError : public RawObject {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Error);
 };
 
 
 class RawApiError : public RawError {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ApiError);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->message_);
@@ skipping 343 matching lines @@
   }
 
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 
-class RawICData : public RawInstance {
-  RAW_HEAP_OBJECT_IMPLEMENTATION(ICData);
-
-  RawObject** from() {
-    return reinterpret_cast<RawObject**>(&ptr()->function_);
-  }
-
-  RawObject** to() {
-    return reinterpret_cast<RawObject**>(&ptr()->ic_data_);
-  }
-
-  RawFunction* function_;  // Parent/calling function of this IC.
-  RawString* target_name_;  // Name of target function.
-  RawArray* ic_data_;  // Contains test classes and target function.
-  intptr_t id_;  // Parser node id corresponding to this IC.
-  intptr_t num_args_tested_;  // Number of arguments tested in IC.
-};
-
-
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_