Index: src/ic/mips64/handler-compiler-mips64.cc |
diff --git a/src/ic/mips64/handler-compiler-mips64.cc b/src/ic/mips64/handler-compiler-mips64.cc |
index 77f6c8e39502372c01ba086c528b16ae63b55887..b9bb1955c5a352625c1a26e93cc2ce4af6d5792b 100644 |
--- a/src/ic/mips64/handler-compiler-mips64.cc |
+++ b/src/ic/mips64/handler-compiler-mips64.cc |
@@ -279,9 +279,16 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
call_data_undefined = true; |
__ LoadRoot(data, Heap::kUndefinedValueRootIndex); |
} else { |
- __ ld(data, FieldMemOperand(callee, JSFunction::kSharedFunctionInfoOffset)); |
- __ ld(data, FieldMemOperand(data, SharedFunctionInfo::kFunctionDataOffset)); |
- __ ld(data, FieldMemOperand(data, FunctionTemplateInfo::kCallCodeOffset)); |
+ if (optimization.is_constant_call()) { |
+ __ ld(data, |
+ FieldMemOperand(callee, JSFunction::kSharedFunctionInfoOffset)); |
+ __ ld(data, |
+ FieldMemOperand(data, SharedFunctionInfo::kFunctionDataOffset)); |
+ __ ld(data, FieldMemOperand(data, FunctionTemplateInfo::kCallCodeOffset)); |
+ } else { |
+ __ ld(data, |
+ FieldMemOperand(callee, FunctionTemplateInfo::kCallCodeOffset)); |
+ } |
__ ld(data, FieldMemOperand(data, CallHandlerInfo::kDataOffset)); |
} |
@@ -299,7 +306,8 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
__ li(api_function_address, Operand(ref)); |
// Jump to stub. |
- CallApiAccessorStub stub(isolate, is_store, call_data_undefined); |
+ CallApiAccessorStub stub(isolate, is_store, call_data_undefined, |
+ !optimization.is_constant_call()); |
__ TailCallStub(&stub); |
} |