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

runtime/vm/code_generator_x64.cc

 // 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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/code_generator.h"
 
 #include "lib/error.h"
 #include "vm/ast_printer.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
-#include "vm/ic_data.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/resolver.h"
 #include "vm/stub_code.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, print_ast, false, "Print abstract syntax tree.");
@@ skipping 416 matching lines @@
     intptr_t node_id,
     intptr_t token_index,
     const String& function_name,
     int num_arguments,
     const Array& optional_arguments_names,
     intptr_t num_args_checked) {
   ASSERT(num_args_checked > 0);  // At least receiver check is necessary.
   // Set up the function name and number of arguments (including the receiver)
   // to the InstanceCall stub which will resolve the correct entrypoint for
   // the operator and call it.
-  ICData ic_data(function_name, num_args_checked);
-  __ LoadObject(RBX, Array::ZoneHandle(ic_data.data()));
+  ICData& ic_data = ICData::ZoneHandle();
+  ic_data = ICData::New(parsed_function().function(),
+                        function_name,
+                        node_id,
+                        num_args_checked);
+  __ LoadObject(RBX, ic_data);
   __ LoadObject(R10, ArgumentsDescriptor(num_arguments,
                                          optional_arguments_names));
   uword label_address = 0;
   switch (num_args_checked) {
     case 1:
       label_address = StubCode::OneArgCheckInlineCacheEntryPoint();
       break;
     case 2:
       label_address = StubCode::TwoArgsCheckInlineCacheEntryPoint();
       break;
@@ skipping 218 matching lines @@
     __ cmpq(Address(RDI, 0), raw_null);
     __ j(EQUAL, &all_arguments_processed, Assembler::kNearJump);
 
     __ Bind(&wrong_num_arguments);
     if (function.IsClosureFunction()) {
       GenerateCallRuntime(AstNode::kNoId,
                           function.token_index(),
                           kClosureArgumentMismatchRuntimeEntry);
     } else {
       // Invoke noSuchMethod function.
-      ICData ic_data(String::Handle(function.name()), 1);
-      __ LoadObject(RBX, Array::ZoneHandle(ic_data.data()));
+      const int kNumArgsChecked = 1;
+      ICData& ic_data = ICData::ZoneHandle();
+      ic_data = ICData::New(parsed_function().function(),
+                            String::Handle(function.name()),
+                            AstNode::kNoId,
+                            kNumArgsChecked);
+      __ LoadObject(RBX, ic_data);
       // RBP : points to previous frame pointer.
       // RBP + 8 : points to return address.
       // RBP + 16 : address of last argument (arg n-1).
       // RSP + 16 + 8*(n-1) : address of first argument (arg 0).
       // RBX : ic-data array.

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

Remove "array" in comment?

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

Done.

       // R10 : arguments descriptor array.
       __ call(&StubCode::CallNoSuchMethodFunctionLabel());
     }
 
     if (FLAG_trace_functions) {
       __ pushq(RAX);  // Preserve result.
       __ PushObject(function);
       GenerateCallRuntime(AstNode::kNoId,
                           0,
                           kTraceFunctionExitRuntimeEntry);
@@ skipping 2096 matching lines @@
   const Error& error = Error::Handle(
       Parser::FormatError(script, token_index, "Error", format, args));
   va_end(args);
   Isolate::Current()->long_jump_base()->Jump(1, error);
   UNREACHABLE();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64