| Index: src/builtins/arm64/builtins-arm64.cc
|
| diff --git a/src/builtins/arm64/builtins-arm64.cc b/src/builtins/arm64/builtins-arm64.cc
|
| index b4a728a9da3196e70baa786a2745156ab98d7119..95eb7a2c2cd3b3d5ae59e2c45a8e103008a6687e 100644
|
| --- a/src/builtins/arm64/builtins-arm64.cc
|
| +++ b/src/builtins/arm64/builtins-arm64.cc
|
| @@ -1735,16 +1735,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) {
|
| - __ Ldr(x0, MemOperand(fp, StandardFrameConstants::kCallerFPOffset));
|
| - __ Ldr(x0, MemOperand(x0, JavaScriptFrameConstants::kFunctionOffset));
|
| - } else {
|
| - __ Ldr(x0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| - }
|
| -
|
| + __ Ldr(x0, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
|
| {
|
| FrameScope scope(masm, StackFrame::INTERNAL);
|
| // Pass function as argument.
|
| @@ -1752,18 +1745,12 @@
|
| __ 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.
|
| Label skip;
|
| __ CompareAndBranch(x0, Smi::FromInt(0), ne, &skip);
|
| __ Ret();
|
|
|
| __ Bind(&skip);
|
| -
|
| - // 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]
|
| @@ -1782,14 +1769,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
|
|
|