| Index: src/ia32/builtins-ia32.cc
|
| diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc
|
| index b12de805e2c958913cb3badf3f032a3b8d7abf62..77680a8522763a7e74454185adc9918e5032dfe4 100644
|
| --- a/src/ia32/builtins-ia32.cc
|
| +++ b/src/ia32/builtins-ia32.cc
|
| @@ -532,10 +532,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
|
| // o ebp: the caller's frame pointer
|
| // o esp: stack pointer (pointing to return address)
|
| //
|
| -// The function builds a JS frame. Please see JavaScriptFrameConstants in
|
| -// frames-ia32.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
|
| @@ -644,8 +642,9 @@ void Builtins::Generate_InterpreterEntryTrampoline(MacroAssembler* masm) {
|
| // and header removal.
|
| __ add(ebx, Immediate(Code::kHeaderSize - kHeapObjectTag));
|
| __ call(ebx);
|
| - __ nop(); // Ensure that return address still counts as interpreter entry
|
| - // trampoline.
|
| +
|
| + // Even though the first bytecode handler was called, we will never return.
|
| + __ Abort(kUnexpectedReturnFromBytecodeHandler);
|
| }
|
|
|
|
|
|
|