Index: src/arm64/builtins-arm64.cc |
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc |
index 337a090ad351adfe3e002f80bf22fcc5023aec42..db85eb737135c73c1c3383894c9eef1732844aba 100644 |
--- a/src/arm64/builtins-arm64.cc |
+++ b/src/arm64/builtins-arm64.cc |
@@ -2098,6 +2098,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)); |
@@ -2573,7 +2583,8 @@ void Builtins::Generate_Construct(MacroAssembler* masm) { |
// static |
-void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
+void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
+ MacroAssembler* masm, TailCallMode tail_call_mode) { |
// ----------- S t a t e ------------- |
// -- x0 : the number of arguments (not including the receiver) |
// -- x2 : the address of the first argument to be pushed. Subsequent |
@@ -2601,7 +2612,9 @@ void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
__ B(gt, &loop_header); |
// Call the target. |
- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny, |
+ tail_call_mode), |
+ RelocInfo::CODE_TARGET); |
} |