| Index: src/arm/stub-cache-arm.cc
|
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
|
| index f22acb4709e386d75a2a4df18f981624449de2fa..3d0a36f77e6b2ddc8bff7e19186a5b20293ee068 100644
|
| --- a/src/arm/stub-cache-arm.cc
|
| +++ b/src/arm/stub-cache-arm.cc
|
| @@ -954,7 +954,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);
|
| }
|
|
|
| @@ -2085,8 +2086,8 @@ Handle<Code> CallStubCompiler::CompileStringFromCharCodeCall(
|
| // Tail call the full function. We do not have to patch the receiver
|
| // because the function makes no use of it.
|
| __ bind(&slow);
|
| - __ InvokeFunction(
|
| - function, arguments(), JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
|
|
| __ bind(&miss);
|
| // r2: function name.
|
| @@ -2196,8 +2197,8 @@ Handle<Code> CallStubCompiler::CompileMathFloorCall(
|
| __ bind(&slow);
|
| // Tail call the full function. We do not have to patch the receiver
|
| // because the function makes no use of it.
|
| - __ InvokeFunction(
|
| - function, arguments(), JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
|
|
| __ bind(&miss);
|
| // r2: function name.
|
| @@ -2295,8 +2296,8 @@ Handle<Code> CallStubCompiler::CompileMathAbsCall(
|
| // Tail call the full function. We do not have to patch the receiver
|
| // because the function makes no use of it.
|
| __ bind(&slow);
|
| - __ InvokeFunction(
|
| - function, arguments(), JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
| + __ InvokeFunction(function, ParameterCount(function), arguments(),
|
| + JUMP_FUNCTION, NullCallWrapper(), CALL_AS_METHOD);
|
|
|
| __ bind(&miss);
|
| // r2: function name.
|
| @@ -2470,8 +2471,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);
|
| }
|
|
|
|
|
| @@ -2653,8 +2654,9 @@ void StoreStubCompiler::GenerateStoreViaSetter(
|
| // Call the JavaScript setter with receiver and value on the stack.
|
| __ Push(r1, r0);
|
| 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.
|
| @@ -2838,8 +2840,9 @@ void LoadStubCompiler::GenerateLoadViaGetter(MacroAssembler* masm,
|
| // Call the JavaScript getter with the receiver on the stack.
|
| __ push(r0);
|
| 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.
|
|
|