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 6c9e006890013a58dfcc97ccc0f2ced30adb2218..00c3242f48a92a1ed670e08db985908540b8c77c 100644 |
--- a/src/ic/mips/handler-compiler-mips.cc |
+++ b/src/ic/mips/handler-compiler-mips.cc |
@@ -18,7 +18,7 @@ namespace internal { |
void NamedLoadHandlerCompiler::GenerateLoadViaGetter( |
MacroAssembler* masm, Handle<HeapType> type, Register receiver, |
- Handle<JSFunction> getter) { |
+ Register holder, int accessor_index, int expected_arguments) { |
// ----------- S t a t e ------------- |
// -- a0 : receiver |
// -- a2 : name |
@@ -27,7 +27,7 @@ void NamedLoadHandlerCompiler::GenerateLoadViaGetter( |
{ |
FrameScope scope(masm, StackFrame::INTERNAL); |
- if (!getter.is_null()) { |
+ if (accessor_index >= 0) { |
// Call the JavaScript getter with the receiver on the stack. |
if (IC::TypeToMap(*type, masm->isolate())->IsJSGlobalObjectMap()) { |
// Swap in the global receiver. |
@@ -36,9 +36,14 @@ void NamedLoadHandlerCompiler::GenerateLoadViaGetter( |
} |
__ push(receiver); |
ParameterCount actual(0); |
- ParameterCount expected(getter); |
- __ InvokeFunction(getter, expected, actual, CALL_FUNCTION, |
- NullCallWrapper()); |
+ ParameterCount expected(expected_arguments); |
+ Register scratch = holder; |
+ __ lw(scratch, FieldMemOperand(holder, HeapObject::kMapOffset)); |
+ __ LoadInstanceDescriptors(scratch, scratch); |
+ __ lw(scratch, FieldMemOperand(scratch, DescriptorArray::GetValueOffset( |
+ accessor_index))); |
+ __ lw(a1, FieldMemOperand(scratch, AccessorPair::kGetterOffset)); |
+ __ InvokeFunction(a1, expected, actual, CALL_FUNCTION, NullCallWrapper()); |
} else { |
// If we generate a global code snippet for deoptimization only, remember |
// the place to continue after deoptimization. |