Index: src/mips64/builtins-mips64.cc |
diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc |
index a8498b0fb9cf0d762d029f87f7b797ab8ae6993e..b3704dc05fd27442219df92ce4cb38fd2d079ed1 100644 |
--- a/src/mips64/builtins-mips64.cc |
+++ b/src/mips64/builtins-mips64.cc |
@@ -855,10 +855,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) { |
// o sp: stack pointer |
// o ra: return address |
// |
-// The function builds a JS frame. Please see JavaScriptFrameConstants in |
-// frames-mips.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 |
@@ -955,6 +953,9 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) { |
// and header removal. |
__ Daddu(at, at, Operand(Code::kHeaderSize - kHeapObjectTag)); |
__ Call(at); |
+ |
+ // Even though the first bytecode handler was called, we will never return. |
+ __ Abort(kUnexpectedReturnFromBytecodeHandler); |
} |