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

runtime/vm/code_patcher_arm_test.cc

Index: runtime/vm/code_patcher_arm_test.cc
===================================================================
--- runtime/vm/code_patcher_arm_test.cc	(revision 24193)
+++ runtime/vm/code_patcher_arm_test.cc	(working copy)
@@ -56,12 +56,14 @@
                     true, false, false, false, owner_class, 0));

[siva, 2013/06/19 23:07:15]

I think function and function_name don't have to be zone handles here.

[srdjan, 2013/06/20 00:12:34]

Done.

 
   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()));

[siva, 2013/06/19 23:07:15]

args_descriptor doesn't have to be a ZoneHandle anymore.

[srdjan, 2013/06/20 00:12:34]

Done.

+  const ICData& ic_data = ICData::ZoneHandle(ICData::New(function,
+                                                         target_name,
+                                                         args_descriptor,
+                                                         15,
+                                                         1));
 
-  __ LoadObject(R4, args_descriptor);
   __ LoadObject(R5, ic_data);
   ExternalLabel target_label(
       "InlineCache", StubCode::OneArgCheckInlineCacheEntryPoint());
@@ -74,7 +76,7 @@
   uword return_address =
       test->entry() + test->code().Size() - Instr::kInstrSize;
   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());