| Index: src/x64/stub-cache-x64.cc
|
| diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
|
| index 41e5b882642287e01ed347cdd347c373643b0c16..4aa9a7cc695d70000de5d3c46f50528d7bca5587 100644
|
| --- a/src/x64/stub-cache-x64.cc
|
| +++ b/src/x64/stub-cache-x64.cc
|
| @@ -621,7 +621,8 @@ class CallInterceptorCompiler BASE_EMBEDDED {
|
| CallKind call_kind = CallICBase::Contextual::decode(extra_ic_state_)
|
| ? CALL_AS_FUNCTION
|
| : CALL_AS_METHOD;
|
| - __ InvokeFunction(optimization.constant_function(), arguments_,
|
| + Handle<JSFunction> fun = optimization.constant_function();
|
| + __ InvokeFunction(fun, ParameterCount(fun), arguments_,
|
| JUMP_FUNCTION, NullCallWrapper(), call_kind);
|
| }
|
|
|
| @@ -1991,8 +1992,8 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall(
|
| CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
|
| ? CALL_AS_FUNCTION
|
| : CALL_AS_METHOD;
|
| - __ InvokeFunction(function, arguments(), JUMP_FUNCTION,
|
| - NullCallWrapper(), call_kind);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), call_kind);
|
|
|
| __ bind(&miss);
|
| // rcx: function name.
|
| @@ -2106,8 +2107,8 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall(
|
| CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
|
| ? CALL_AS_FUNCTION
|
| : CALL_AS_METHOD;
|
| - __ InvokeFunction(function, arguments(), JUMP_FUNCTION,
|
| - NullCallWrapper(), call_kind);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), call_kind);
|
|
|
| __ bind(&miss);
|
| // rcx: function name.
|
| @@ -2290,8 +2291,8 @@ void CallStubCompiler::CompileHandlerBackend(Handle<JSFunction> function) {
|
| CallKind call_kind = CallICBase::Contextual::decode(extra_state_)
|
| ? CALL_AS_FUNCTION
|
| : CALL_AS_METHOD;
|
| - __ InvokeFunction(function, arguments(), JUMP_FUNCTION,
|
| - NullCallWrapper(), call_kind);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), call_kind);
|
| }
|
|
|
|
|
| @@ -2503,8 +2504,9 @@ void StoreStubCompiler::GenerateStoreViaSetter(
|
| __ push(rdx);
|
| __ push(rax);
|
| ParameterCount actual(1);
|
| - __ InvokeFunction(setter, actual, CALL_FUNCTION, NullCallWrapper(),
|
| - CALL_AS_METHOD);
|
| + ParameterCount expected(setter);
|
| + __ InvokeFunction(setter, expected, actual,
|
| + CALL_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| } else {
|
| // If we generate a global code snippet for deoptimization only, remember
|
| // the place to continue after deoptimization.
|
| @@ -2723,8 +2725,9 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm,
|
| // Call the JavaScript getter with the receiver on the stack.
|
| __ push(rax);
|
| ParameterCount actual(0);
|
| - __ InvokeFunction(getter, actual, CALL_FUNCTION, NullCallWrapper(),
|
| - CALL_AS_METHOD);
|
| + ParameterCount expected(getter);
|
| + __ InvokeFunction(getter, expected, actual,
|
| + CALL_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| } else {
|
| // If we generate a global code snippet for deoptimization only, remember
|
| // the place to continue after deoptimization.
|
|
|