| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index bd7d067c28b64f5fe10bd1a5d2e3323a2a88d077..1eda1ff0275cf5e33c672c2a4bf02d2c49a7bcdf 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -874,10 +874,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
|
| // o sp: stack pointer
|
| // o lr: return address
|
| //
|
| -// The function builds a JS frame. Please see JavaScriptFrameConstants in
|
| -// frames-arm.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
|
| @@ -975,6 +973,9 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // and header removal.
|
| __ add(ip, ip, Operand(Code::kHeaderSize - kHeapObjectTag));
|
| __ Call(ip);
|
| +
|
| + // Even though the first bytecode handler was called, we will never return.
|
| + __ Abort(kUnexpectedReturnFromBytecodeHandler);
|
| }
|
|
|
|
|
|
|