Index: src/x87/builtins-x87.cc |
diff --git a/src/x87/builtins-x87.cc b/src/x87/builtins-x87.cc |
index a56950296470dbd1e5e1e4999a4a9226cd5994eb..cf523a8813f603d97599707639e666aaef524848 100644 |
--- a/src/x87/builtins-x87.cc |
+++ b/src/x87/builtins-x87.cc |
@@ -99,7 +99,6 @@ static void GenerateTailCallToSharedCode(MacroAssembler* masm) { |
__ jmp(ebx); |
} |
- |
void Builtins::Generate_InOptimizationQueue(MacroAssembler* masm) { |
// Checking whether the queued function is ready for install is optional, |
// since we come across interrupts and stack checks elsewhere. However, |
@@ -678,7 +677,8 @@ static void Generate_InterpreterPushArgs(MacroAssembler* masm, |
// static |
-void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
+void Builtins::Generate_InterpreterPushArgsAndCallImpl( |
+ MacroAssembler* masm, TailCallMode tail_call_mode) { |
// ----------- S t a t e ------------- |
// -- eax : the number of arguments (not including the receiver) |
// -- ebx : the address of the first argument to be pushed. Subsequent |
@@ -701,7 +701,9 @@ void Builtins::Generate_InterpreterPushArgsAndCall(MacroAssembler* masm) { |
// Call the target. |
__ Push(edx); // Re-push return address. |
- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Jump(masm->isolate()->builtins()->Call(ConvertReceiverMode::kAny, |
+ tail_call_mode), |
+ RelocInfo::CODE_TARGET); |
} |
@@ -2016,6 +2018,16 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg, |
__ cmp(scratch1, Immediate(0)); |
__ j(not_equal, &done, Label::kNear); |
+ // Drop possible interpreter handler/stub frame. |
+ { |
+ Label no_interpreter_frame; |
+ __ cmp(Operand(ebp, StandardFrameConstants::kMarkerOffset), |
+ Immediate(Smi::FromInt(StackFrame::STUB))); |
+ __ j(not_equal, &no_interpreter_frame, Label::kNear); |
+ __ mov(ebp, Operand(ebp, StandardFrameConstants::kCallerFPOffset)); |
+ __ bind(&no_interpreter_frame); |
+ } |
+ |
// Check if next frame is an arguments adaptor frame. |
Label no_arguments_adaptor, formal_parameter_count_loaded; |
__ mov(scratch2, Operand(ebp, StandardFrameConstants::kCallerFPOffset)); |