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

runtime/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/snapshot.h"
@@ skipping 47 matching lines @@
       V(ExternalFourByteString)                                                \
     V(Bool)                                                                    \
     V(Array)                                                                   \
       V(ImmutableArray)                                                        \
     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 550 matching lines @@
   RAW_HEAP_OBJECT_IMPLEMENTATION(Code);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->instructions_);
   }
   RawInstructions* instructions_;
   RawFunction* function_;
   RawExceptionHandlers* exception_handlers_;
   RawPcDescriptors* pc_descriptors_;
   RawLocalVarDescriptors* var_descriptors_;
-  // Ongoing redesign of inline caches may soon remove the need for 'ic_data_'.
-  RawArray* ic_data_;  // Used to store IC stub data (see class ICData).
   RawObject** to() {
-    return reinterpret_cast<RawObject**>(&ptr()->ic_data_);
+    return reinterpret_cast<RawObject**>(&ptr()->var_descriptors_);
   }
 
   intptr_t pointer_offsets_length_;
   // This cannot be boolean because of alignment issues on x64 architectures.
   intptr_t is_optimized_;
 
   // Variable length data follows here.
   int32_t data_[0];
 };
 
@@ skipping 424 matching lines @@
     return reinterpret_cast<RawObject**>(&ptr()->pattern_);
   }
 
   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_