| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index d47acaad7848b51f0cb2c1c2d042528fe79128c6..766795f0077bf15844aa40c822b0970d39ca35ad 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -1104,7 +1104,8 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm, Register index,
|
|
|
|
|
| // static
|
| -void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) {
|
| +void Builtins::Generate_InterpreterPushArgsAndCallImpl(
|
| + MacroAssembler* masm, TailCallMode tail_call_mode) {
|
| // ----------- S t a t e -------------
|
| // -- r0 : the number of arguments (not including the receiver)
|
| // -- r2 : the address of the first argument to be pushed. Subsequent
|
| @@ -1122,7 +1123,9 @@ void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) {
|
| Generate_InterpreterPushArgs(masm, r2, r3, r4);
|
|
|
| // Call the target.
|
| - __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET);
|
| + __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny,
|
| + tail_call_mode),
|
| + RelocInfo::CODE_TARGET);
|
| }
|
|
|
|
|
| @@ -2068,6 +2071,16 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg,
|
| __ cmp(scratch1, Operand(0));
|
| __ b(ne, &done);
|
|
|
| + // Drop possible interpreter handler/stub frame.
|
| + {
|
| + Label no_interpreter_frame;
|
| + __ ldr(scratch3, MemOperand(fp, StandardFrameConstants::kMarkerOffset));
|
| + __ cmp(scratch3, Operand(Smi::FromInt(StackFrame::STUB)));
|
| + __ b(ne, &no_interpreter_frame);
|
| + __ ldr(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
|
| + __ bind(&no_interpreter_frame);
|
| + }
|
| +
|
| // Check if next frame is an arguments adaptor frame.
|
| Label no_arguments_adaptor, formal_parameter_count_loaded;
|
| __ ldr(scratch2, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
|
|
|