Index: src/ic/arm/handler-compiler-arm.cc |
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc |
index 9a774e85086343bd923dda223db9f2242a758ee1..2f239b2b977db0504bdd4c6cc1ee3a9f36eff825 100644 |
--- a/src/ic/arm/handler-compiler-arm.cc |
+++ b/src/ic/arm/handler-compiler-arm.cc |
@@ -232,7 +232,9 @@ static void CompileCallLoadPropertyWithInterceptor( |
void PropertyHandlerCompiler::GenerateApiAccessorCall( |
MacroAssembler* masm, const CallOptimization& optimization, |
Handle<Map> receiver_map, Register receiver, Register scratch_in, |
- bool is_store, Register store_parameter) { |
+ bool is_store, Register store_parameter, Register accessor_holder, |
+ int accessor_index) { |
+ DCHECK(!accessor_holder.is(scratch_in)); |
DCHECK(!receiver.is(scratch_in)); |
__ push(receiver); |
// Write the arguments to stack frame. |
@@ -249,6 +251,10 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
Register holder = r2; |
Register api_function_address = r1; |
+ // Put callee in place. |
+ __ LoadAccessor(callee, accessor_holder, accessor_index, |
+ is_store ? ACCESSOR_SETTER : ACCESSOR_GETTER); |
+ |
// Put holder in place. |
CallOptimization::HolderLookup holder_lookup; |
Handle<JSObject> api_holder = |
@@ -266,13 +272,9 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
} |
Isolate* isolate = masm->isolate(); |
- Handle<JSFunction> function = optimization.constant_function(); |
Handle<CallHandlerInfo> api_call_info = optimization.api_call_info(); |
Handle<Object> call_data_obj(api_call_info->data(), isolate); |
- // Put callee in place. |
- __ Move(callee, function); |
- |
bool call_data_undefined = false; |
// Put call_data in place. |
if (isolate->heap()->InNewSpace(*call_data_obj)) { |