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

runtime/vm/code_patcher_ia32.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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/cpu.h"
-#include "vm/ic_data.h"
 #include "vm/instructions.h"
 #include "vm/object.h"
 #include "vm/raw_object.h"
 
 namespace dart {
 
 // The pattern of a Dart call is:
 //  1: mov ECX, immediate 1
 //  2: mov EDX, immediate 2
 //  3: call target_address
@@ skipping 91 matching lines @@
     f ^= reinterpret_cast<RawObject*>(immediate_one());
     return f.raw();
   }
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticCall);
 };
 
 
 // The expected pattern of a dart instance call:
-//  mov ECX, ic-data array
+//  mov ECX, ic-data
 //  mov EDX, argument_descriptor_array
 //  call target_address
 //  <- return address
 class InstanceCall : public DartCallPattern {
  public:
   explicit InstanceCall(uword return_address)
       : DartCallPattern(return_address) {}
 
-  RawArray* ic_data() const {
-    Array& array = Array::Handle();
-    array ^= reinterpret_cast<RawObject*>(immediate_one());
-    return array.raw();
+  RawICData* ic_data() const {
+    ICData& ic_data = ICData::Handle();
+    ic_data ^= reinterpret_cast<RawObject*>(immediate_one());
+    return ic_data.raw();
   }
 
-  void SetIcData(const Array& value) {
+  void SetIcData(const ICData& value) {
     set_immediate_one(reinterpret_cast<int32_t>(value.raw()));
   }
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstanceCall);
 };
 
 
 void CodePatcher::GetStaticCallAt(uword return_address,
                                   Function* function,
@@ skipping 92 matching lines @@
                                     int* num_named_arguments,
                                     uword* target) {
   ASSERT(function_name != NULL);
   ASSERT(num_arguments != NULL);
   ASSERT(num_named_arguments != NULL);
   ASSERT(target != NULL);
   InstanceCall call(return_address);
   *num_arguments = call.argument_count();
   *num_named_arguments = call.named_argument_count();
   *target = call.target();
-  ICData ic_data(Array::ZoneHandle(call.ic_data()));
-  *function_name = ic_data.FunctionName();
+  const ICData& ic_data = ICData::Handle(call.ic_data());
+  *function_name = ic_data.target_name();
 }
 
 
-RawArray* CodePatcher::GetInstanceCallIcDataAt(uword return_address) {
+RawICData* CodePatcher::GetInstanceCallIcDataAt(uword return_address) {
   InstanceCall call(return_address);
   return call.ic_data();
 }
 
 
-void CodePatcher::SetInstanceCallIcDataAt(uword return_address,
-                                          const Array& ic_data) {
-  InstanceCall call(return_address);
-  call.SetIcData(ic_data);
-}
-
-
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return DartCallPattern::kNumInstructions * DartCallPattern::kInstructionSize;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32