Index: src/mips/builtins-mips.cc |
diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc |
index 076cb330699b9e35a2318b0da87e8d051c9e4544..7448a400c86754cc2fde3558864adaebbb11d18a 100644 |
--- a/src/mips/builtins-mips.cc |
+++ b/src/mips/builtins-mips.cc |
@@ -1075,7 +1075,8 @@ void Builtins::Generate_InterpreterExitTrampoline(MacroAssembler* masm) { |
// static |
-void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
+void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
+ MacroAssembler* masm, TailCallMode tail_call_mode) { |
// ----------- S t a t e ------------- |
// -- a0 : the number of arguments (not including the receiver) |
// -- a2 : the address of the first argument to be pushed. Subsequent |
@@ -1100,7 +1101,9 @@ void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
__ Branch(&loop_header, gt, a2, Operand(a3)); |
// Call the target. |
- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny, |
+ tail_call_mode), |
+ RelocInfo::CODE_TARGET); |
} |
@@ -2079,6 +2082,16 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg, |
__ lb(scratch1, MemOperand(at)); |
__ Branch(&done, ne, scratch1, Operand(zero_reg)); |
+ // Drop possible interpreter handler/stub frame. |
+ { |
+ Label no_interpreter_frame; |
+ __ lw(scratch3, MemOperand(fp, StandardFrameConstants::kMarkerOffset)); |
+ __ Branch(&no_interpreter_frame, ne, scratch3, |
+ Operand(Smi::FromInt(StackFrame::STUB))); |
+ __ lw(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; |
__ lw(scratch2, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |