From e0e34be06f803d46a7c016e017e7c1310d555b0b Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Sat, 9 Mar 2024 20:29:47 -0500 Subject: [PATCH] adapt to implicit leave change in Julia (#614) Fixes https://github.com/JuliaDebug/JuliaInterpreter.jl/issues/610 Refs https://github.com/JuliaLang/julia/pull/52245 --- src/interpret.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/interpret.jl b/src/interpret.jl index 975d4490..e6fcabe4 100644 --- a/src/interpret.jl +++ b/src/interpret.jl @@ -670,7 +670,9 @@ function handle_err(@nospecialize(recurse), frame, err) rethrow(err) end data.last_exception[] = err - return (frame.pc = data.exception_frames[end]) + pc = VERSION >= v"1.11-" ? pop!(data.exception_frames) : data.exception_frames[end] # implicit :leave after https://github.com/JuliaLang/julia/pull/52245 + frame.pc = pc + return pc end lookup_return(frame, node::ReturnNode) = @lookup(frame, node.val)