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 613198d35a0e0522b35e06273b4045ef604a804f..be6245c2778cb56f7b89426fdd992c2b08ee2645 100644 |
--- a/src/ic/ia32/handler-compiler-ia32.cc |
+++ b/src/ic/ia32/handler-compiler-ia32.cc |
@@ -236,7 +236,7 @@ void PropertyHandlerCompiler::GenerateCheckPropertyCell( |
void NamedStoreHandlerCompiler::GenerateStoreViaSetter( |
MacroAssembler* masm, Handle<HeapType> type, Register receiver, |
- Handle<JSFunction> setter) { |
+ Register holder, int accessor_index, int expected_arguments) { |
// ----------- S t a t e ------------- |
// -- esp[0] : return address |
// ----------------------------------- |
@@ -246,7 +246,7 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter( |
// Save value register, so we can restore it later. |
__ push(value()); |
- if (!setter.is_null()) { |
+ if (accessor_index >= 0) { |
// Call the JavaScript setter with receiver and value on the stack. |
if (IC::TypeToMap(*type, masm->isolate())->IsJSGlobalObjectMap()) { |
// Swap in the global receiver. |
@@ -256,8 +256,14 @@ void NamedStoreHandlerCompiler::GenerateStoreViaSetter( |
__ push(receiver); |
__ push(value()); |
ParameterCount actual(1); |
- ParameterCount expected(setter); |
- __ InvokeFunction(setter, expected, actual, CALL_FUNCTION, |
+ ParameterCount expected(expected_arguments); |
+ Register scratch = holder; |
+ __ mov(scratch, FieldOperand(holder, HeapObject::kMapOffset)); |
+ __ LoadInstanceDescriptors(scratch, scratch); |
+ __ mov(scratch, FieldOperand(scratch, DescriptorArray::GetValueOffset( |
+ accessor_index))); |
+ __ mov(edi, FieldOperand(scratch, AccessorPair::kSetterOffset)); |
+ __ InvokeFunction(edi, expected, actual, CALL_FUNCTION, |
NullCallWrapper()); |
} else { |
// If we generate a global code snippet for deoptimization only, remember |