Index: runtime/vm/code_patcher_ia32_test.cc |
=================================================================== |
--- runtime/vm/code_patcher_ia32_test.cc (revision 24207) |
+++ runtime/vm/code_patcher_ia32_test.cc (working copy) |
@@ -49,20 +49,21 @@ |
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(ECX, ic_data); |
- __ LoadObject(EDX, args_descriptor); |
ExternalLabel target_label( |
"InlineCache", StubCode::OneArgCheckInlineCacheEntryPoint()); |
__ call(&target_label); |
@@ -73,7 +74,7 @@ |
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()); |