Index: src/ic/arm/handler-compiler-arm.cc |
diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc |
index fa6152524418d1f9ba1a4bf789281bb0ea267b89..941bbbb7e5b04d16e1631eda02b20f26941af21b 100644 |
--- a/src/ic/arm/handler-compiler-arm.cc |
+++ b/src/ic/arm/handler-compiler-arm.cc |
@@ -286,11 +286,17 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
call_data_undefined = true; |
__ LoadRoot(data, Heap::kUndefinedValueRootIndex); |
} else { |
- __ ldr(data, |
- FieldMemOperand(callee, JSFunction::kSharedFunctionInfoOffset)); |
- __ ldr(data, |
- FieldMemOperand(data, SharedFunctionInfo::kFunctionDataOffset)); |
- __ ldr(data, FieldMemOperand(data, FunctionTemplateInfo::kCallCodeOffset)); |
+ if (optimization.is_constant_call()) { |
+ __ ldr(data, |
+ FieldMemOperand(callee, JSFunction::kSharedFunctionInfoOffset)); |
+ __ ldr(data, |
+ FieldMemOperand(data, SharedFunctionInfo::kFunctionDataOffset)); |
+ __ ldr(data, |
+ FieldMemOperand(data, FunctionTemplateInfo::kCallCodeOffset)); |
+ } else { |
+ __ ldr(data, |
+ FieldMemOperand(callee, FunctionTemplateInfo::kCallCodeOffset)); |
+ } |
__ ldr(data, FieldMemOperand(data, CallHandlerInfo::kDataOffset)); |
} |
@@ -309,7 +315,8 @@ void PropertyHandlerCompiler::GenerateApiAccessorCall( |
__ mov(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); |
} |