Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index 077408c0141bd74547a508980fc361330ba70db8..f0ef644d464172ecca80230a0b0a053328154f64 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -1149,6 +1149,12 @@ void Builtins::Generate_InterpreterNotifyLazyDeoptimized(MacroAssembler* masm) { |
void Builtins::Generate_InterpreterEnterExceptionHandler(MacroAssembler* masm) { |
+ // Set the address of the interpreter entry trampoline as a return address. |
+ // This simulates the initial call to bytecode handlers in interpreter entry |
+ // trampoline. The return will never actually be taken, but our stack walker |
+ // uses this address to determine whether a frame is interpreted. |
+ __ Move(lr, masm->isolate()->builtins()->InterpreterEntryTrampoline()); |
+ |
Generate_EnterBytecodeDispatch(masm); |
} |