| Index: src/builtins/mips/builtins-mips.cc
 | 
| diff --git a/src/builtins/mips/builtins-mips.cc b/src/builtins/mips/builtins-mips.cc
 | 
| index 94d0ef643d7b72a4a30bee738f67fc988405696b..63c3329e24dcc8e566b8cd738eb3f3008f21e5cb 100644
 | 
| --- a/src/builtins/mips/builtins-mips.cc
 | 
| +++ b/src/builtins/mips/builtins-mips.cc
 | 
| @@ -1723,16 +1723,9 @@
 | 
|    __ TailCallRuntime(Runtime::kThrowIllegalInvocation);
 | 
|  }
 | 
|  
 | 
| -static void Generate_OnStackReplacementHelper(MacroAssembler* masm,
 | 
| -                                              bool has_handler_frame) {
 | 
| +void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
 | 
|    // Lookup the function in the JavaScript frame.
 | 
| -  if (has_handler_frame) {
 | 
| -    __ lw(a0, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
 | 
| -    __ lw(a0, MemOperand(a0, JavaScriptFrameConstants::kFunctionOffset));
 | 
| -  } else {
 | 
| -    __ lw(a0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
 | 
| -  }
 | 
| -
 | 
| +  __ lw(a0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
 | 
|    {
 | 
|      FrameScope scope(masm, StackFrame::INTERNAL);
 | 
|      // Pass function as argument.
 | 
| @@ -1740,14 +1733,8 @@
 | 
|      __ CallRuntime(Runtime::kCompileForOnStackReplacement);
 | 
|    }
 | 
|  
 | 
| -  // If the code object is null, just return to the caller.
 | 
| +  // If the code object is null, just return to the unoptimized code.
 | 
|    __ 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]
 | 
| @@ -1767,14 +1754,6 @@
 | 
|  
 | 
|    // And "return" to the OSR entry point of the function.
 | 
|    __ Ret();
 | 
| -}
 | 
| -
 | 
| -void Builtins::Generate_OnStackReplacement(MacroAssembler* masm) {
 | 
| -  Generate_OnStackReplacementHelper(masm, false);
 | 
| -}
 | 
| -
 | 
| -void Builtins::Generate_InterpreterOnStackReplacement(MacroAssembler* masm) {
 | 
| -  Generate_OnStackReplacementHelper(masm, true);
 | 
|  }
 | 
|  
 | 
|  // static
 | 
| 
 |