Index: src/builtins/mips64/builtins-mips64.cc |
diff --git a/src/builtins/mips64/builtins-mips64.cc b/src/builtins/mips64/builtins-mips64.cc |
index ffbc63eaa90328d05ca167dd0aada544bc1036a5..5ef149374f3f0b6ce83c8bb5ef9513caa3b9b2a8 100644 |
--- a/src/builtins/mips64/builtins-mips64.cc |
+++ b/src/builtins/mips64/builtins-mips64.cc |
@@ -1718,9 +1718,16 @@ void Builtins::Generate_HandleFastApiCall(MacroAssembler* masm) { |
__ TailCallRuntime(Runtime::kThrowIllegalInvocation); |
} |
-void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) { |
+static void Generate_OnStackReplacementHelper(MacroAssembler* masm, |
+ bool has_handler_frame) { |
// Lookup the function in the JavaScript frame. |
- __ ld(a0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
+ if (has_handler_frame) { |
+ __ ld(a0, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
+ __ ld(a0, MemOperand(a0, JavaScriptFrameConstants::kFunctionOffset)); |
+ } else { |
+ __ ld(a0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
+ } |
+ |
{ |
FrameScope scope(masm, StackFrame::INTERNAL); |
// Pass function as argument. |
@@ -1728,9 +1735,15 @@ void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) { |
__ CallRuntime(Runtime::kCompileForOnStackReplacement); |
} |
- // If the code object is null, just return to the unoptimized code. |
+ // If the code object is null, just return to the caller. |
__ Ret(eq, v0, Operand(Smi::FromInt(0))); |
+ // Drop any potential handler frame that is be sitting on top of the actual |
+ // JavaScript frame. This is the case then OSR is triggered from bytecode. |
+ if (has_handler_frame) { |
+ __ LeaveFrame(StackFrame::STUB); |
+ } |
+ |
// Load deoptimization data from the code object. |
// <deopt_data> = <code>[#deoptimization_data_offset] |
__ ld(a1, MemOperand(v0, Code::kDeoptimizationDataOffset - kHeapObjectTag)); |
@@ -1751,6 +1764,14 @@ void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) { |
__ Ret(); |
} |
+void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) { |
+ Generate_OnStackReplacementHelper(masm, false); |
+} |
+ |
+void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) { |
+ Generate_OnStackReplacementHelper(masm, true); |
+} |
+ |
// static |
void Builtins::Generate_DatePrototype_GetField(MacroAssembler* masm, |
int field_index) { |