| Index: src/x64/builtins-x64.cc
|
| diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
|
| index d324d2f1fab2107ae6d7ace7410adc10cb8d0a52..fc4581c342df1a1a55f6e698e288d67523f878fb 100644
|
| --- a/src/x64/builtins-x64.cc
|
| +++ b/src/x64/builtins-x64.cc
|
| @@ -343,11 +343,12 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
|
| Handle<Code> code =
|
| masm->isolate()->builtins()->HandleApiCallConstruct();
|
| ParameterCount expected(0);
|
| - __ InvokeCode(code, expected, expected,
|
| - RelocInfo::CODE_TARGET, CALL_FUNCTION);
|
| + __ InvokeCode(code, expected, expected, RelocInfo::CODE_TARGET,
|
| + CALL_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| } else {
|
| ParameterCount actual(rax);
|
| - __ InvokeFunction(rdi, actual, CALL_FUNCTION);
|
| + __ InvokeFunction(rdi, actual, CALL_FUNCTION,
|
| + NullCallWrapper(), CALL_AS_METHOD);
|
| }
|
|
|
| // Restore context from the frame.
|
| @@ -499,7 +500,8 @@ static void Generate_JSEntryTrampolineHelper(MacroAssembler* masm,
|
| } else {
|
| ParameterCount actual(rax);
|
| // Function must be in rdi.
|
| - __ InvokeFunction(rdi, actual, CALL_FUNCTION);
|
| + __ InvokeFunction(rdi, actual, CALL_FUNCTION,
|
| + NullCallWrapper(), CALL_AS_METHOD);
|
| }
|
|
|
| // Exit the JS frame. Notice that this also removes the empty
|
| @@ -774,7 +776,8 @@ void Builtins::Generate_FunctionCall(MacroAssembler* masm) {
|
| RelocInfo::CODE_TARGET);
|
|
|
| ParameterCount expected(0);
|
| - __ InvokeCode(rdx, expected, expected, JUMP_FUNCTION);
|
| + __ InvokeCode(rdx, expected, expected, JUMP_FUNCTION,
|
| + NullCallWrapper(), CALL_AS_METHOD);
|
| }
|
|
|
|
|
| @@ -914,7 +917,8 @@ void Builtins::Generate_FunctionApply(MacroAssembler* masm) {
|
| ParameterCount actual(rax);
|
| __ SmiToInteger32(rax, rax);
|
| __ movq(rdi, Operand(rbp, kFunctionOffset));
|
| - __ InvokeFunction(rdi, actual, CALL_FUNCTION);
|
| + __ InvokeFunction(rdi, actual, CALL_FUNCTION,
|
| + NullCallWrapper(), CALL_AS_METHOD);
|
|
|
| __ LeaveInternalFrame();
|
| __ ret(3 * kPointerSize); // remove function, receiver, and arguments
|
|
|