Index: src/ic/mips/handler-compiler-mips.cc |
diff --git a/src/ic/mips/handler-compiler-mips.cc b/src/ic/mips/handler-compiler-mips.cc |
index d9dc2b0dc3cbb1ff262263d2ac44c2eb5e27473f..08e6c967aef5170c7e0de4972dddcca4d5dd4f91 100644 |
--- a/src/ic/mips/handler-compiler-mips.cc |
+++ b/src/ic/mips/handler-compiler-mips.cc |
@@ -225,7 +225,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. |
@@ -242,6 +244,10 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
Register holder = a2; |
Register api_function_address = a1; |
+ // Put callee in place. |
+ __ LoadAccessor(callee, holder, accessor_index, |
+ is_store ? ACCESSOR_SETTER : ACCESSOR_GETTER); |
+ |
// Put holder in place. |
CallOptimization::HolderLookup holder_lookup; |
Handle<JSObject> api_holder = |
@@ -259,13 +265,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. |
- __ li(callee, function); |
- |
bool call_data_undefined = false; |
// Put call_data in place. |
if (isolate->heap()->InNewSpace(*call_data_obj)) { |