Index: src/ic/ia32/handler-compiler-ia32.cc |
diff --git a/src/ic/ia32/handler-compiler-ia32.cc b/src/ic/ia32/handler-compiler-ia32.cc |
index 2d2251ee421251663da844be3ae236c28d28e236..507fdb4e951d592b41121ee4d5e99fea99affa05 100644 |
--- a/src/ic/ia32/handler-compiler-ia32.cc |
+++ b/src/ic/ia32/handler-compiler-ia32.cc |
@@ -141,7 +141,9 @@ void NamedLoadHandlerCompiler::GenerateLoadFunctionPrototype( |
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)); |
// Copy return value. |
__ pop(scratch_in); |
// receiver |
@@ -163,6 +165,10 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
Register api_function_address = edx; |
Register scratch = eax; // scratch_in is no longer valid. |
+ // 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 = |
@@ -180,12 +186,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. |
- __ LoadHeapObject(callee, function); |
bool call_data_undefined = false; |
// Put call_data in place. |