Store arguments descriptor in ICData. Remove loading of arguments descriptor at unoptimized call si…

runtime/vm/code_patcher_x64_test.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"
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 31 matching lines @@
 
 CODEGEN_TEST2_RUN(PatchStaticCall, NativePatchStaticCall, Instance::null());
 
 #define __ assembler->
 
 ASSEMBLER_TEST_GENERATE(IcDataAccess, assembler) {
   const String& class_name = String::Handle(Symbols::New("ownerClass"));
   const Script& script = Script::Handle();
   const Class& owner_class =
       Class::Handle(Class::New(class_name, script, Scanner::kDummyTokenIndex));
-  const String& function_name =
-      String::ZoneHandle(Symbols::New("callerFunction"));
-  const Function& function = Function::ZoneHandle(
+  const String& function_name = String::Handle(Symbols::New("callerFunction"));
+  const Function& function = Function::Handle(
       Function::New(function_name, RawFunction::kRegularFunction,
                     true, false, false, false, owner_class, 0));
 
   const String& target_name = String::Handle(String::New("targetFunction"));
-  const ICData& ic_data =
-      ICData::ZoneHandle(ICData::New(function, target_name, 15, 1));
   const Array& args_descriptor =
-      Array::ZoneHandle(ArgumentsDescriptor::New(1, Array::Handle()));
+      Array::Handle(ArgumentsDescriptor::New(1, Object::null_array()));
+  const ICData& ic_data = ICData::ZoneHandle(ICData::New(function,
+                                                         target_name,
+                                                         args_descriptor,
+                                                         15,
+                                                         1));
 
   __ LoadObject(RBX, ic_data);
-  __ LoadObject(R10, args_descriptor);
   ExternalLabel target_label(
       "InlineCache", StubCode::OneArgCheckInlineCacheEntryPoint());
   __ call(&target_label);
   __ ret();
 }
 
 
 ASSEMBLER_TEST_RUN(IcDataAccess, test) {
   uword return_address = test->entry() + CodePatcher::InstanceCallSizeInBytes();
   ICData& ic_data = ICData::Handle();
-  CodePatcher::GetInstanceCallAt(return_address, test->code(), &ic_data, NULL);
+  CodePatcher::GetInstanceCallAt(return_address, test->code(), &ic_data);
   EXPECT_STREQ("targetFunction",
       String::Handle(ic_data.target_name()).ToCString());
   EXPECT_EQ(1, ic_data.num_args_tested());
   EXPECT_EQ(0, ic_data.NumberOfChecks());
 }
 
 }  // namespace dart
 
 #endif  // TARGET_ARCH_X64