Index: src/arm64/builtins-arm64.cc |
diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc |
index eb36c1bf4a258d09397f1d93b70286eabccba99a..e5957481ef10614fe999c265fe5f1847f655638c 100644 |
--- a/src/arm64/builtins-arm64.cc |
+++ b/src/arm64/builtins-arm64.cc |
@@ -897,10 +897,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) { |
// - jssp: stack pointer. |
// - lr: return address. |
// |
-// The function builds a JS frame. Please see JavaScriptFrameConstants in |
-// frames-arm64.h for its layout. |
-// TODO(rmcilroy): We will need to include the current bytecode pointer in the |
-// frame. |
+// The function builds an interpreter frame. See InterpreterFrameConstants in |
+// frames.h for its layout. |
void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
// Open a frame scope to indicate that there is a frame on the stack. The |
// MANUAL indicates that the scope shouldn't actually generate code to set up |
@@ -995,6 +993,9 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
// and header removal. |
__ Add(ip0, ip0, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ Call(ip0); |
+ |
+ // Even though the first bytecode handler was called, we will never return. |
+ __ Abort(kUnexpectedReturnFromBytecodeHandler); |
} |