updates

Author: KristofferC

src/commands.jl

@@ -283,7 +283,9 @@ function unwind_exception(frame::Frame, exc)
             frame.framedata.last_exception[] = exc
             return frame
         end
-        frame = frame.caller
+        # recycle(frame)
+        frame = caller(frame)
+        frame === nothing || (frame.callee = nothing)
     end
     rethrow(exc)
 end
@@ -319,34 +321,39 @@ function debug_command(@nospecialize(recurse), frame::Frame, cmd::AbstractString
         cmd == "nc" && return maybe_reset_frame!(recurse, frame, next_call!(recurse, frame, istoplevel), rootistoplevel)
         cmd == "n" && return maybe_reset_frame!(recurse, frame, next_line!(recurse, frame, istoplevel), rootistoplevel)
         cmd == "se" && return maybe_reset_frame!(recurse, frame, step_expr!(recurse, frame, istoplevel), rootistoplevel)
+   
+        enter_generated = false
+        if cmd == "sg"
+            enter_generated = true
+            cmd = "s"
+        end
+        if cmd == "s"
+            pc = maybe_next_call!(recurse, frame, istoplevel)
+            (isa(pc, BreakpointRef) || pc === nothing) && return maybe_reset_frame!(recurse, frame, pc, rootistoplevel)
+            stmt0 = stmt = pc_expr(frame, pc)
+            if isexpr(stmt, :(=))
+                stmt = stmt.args[2]
+            end
+            ret = evaluate_call!(dummy_breakpoint, frame, stmt; enter_generated=enter_generated)
+            isa(ret, BreakpointRef) && return maybe_reset_frame!(recurse, frame, ret, rootistoplevel)
+            maybe_assign!(frame, stmt0, ret)
+            frame.pc = ret + 1
+            return frame, frame.pc
+        end
+        if cmd == "c"
+            r = root(frame)
+            ret = finish_stack!(recurse, r, rootistoplevel)
+            return isa(ret, BreakpointRef) ? (leaf(r), ret) : nothing
+        end
+        cmd == "finish" && return maybe_reset_frame!(recurse, frame, finish!(recurse, frame, istoplevel), rootistoplevel)
     catch err
         frame = unwind_exception(frame, err)
-        return debug_command(recurse, frame, "nc", istoplevel)
-    end
-    enter_generated = false
-    if cmd == "sg"
-        enter_generated = true
-        cmd = "s"
-    end
-    if cmd == "s"
-        pc = maybe_next_call!(recurse, frame, istoplevel)
-        (isa(pc, BreakpointRef) || pc === nothing) && return maybe_reset_frame!(recurse, frame, pc, rootistoplevel)
-        stmt0 = stmt = pc_expr(frame, pc)
-        if isexpr(stmt, :(=))
-            stmt = stmt.args[2]
+        if cmd == "c"
+            return debug_command(recurse, frame, "c", istoplevel)
+        else
+            return debug_command(recurse, frame, "nc", istoplevel)
         end
-        ret = evaluate_call!(dummy_breakpoint, frame, stmt; enter_generated=enter_generated)
-        isa(ret, BreakpointRef) && return maybe_reset_frame!(recurse, frame, ret, rootistoplevel)
-        maybe_assign!(frame, stmt0, ret)
-        frame.pc = ret + 1
-        return frame, frame.pc
-    end
-    if cmd == "c"
-        r = root(frame)
-        ret = finish_stack!(recurse, r, rootistoplevel)
-        return isa(ret, BreakpointRef) ? (leaf(r), ret) : nothing
     end
-    cmd == "finish" && return maybe_reset_frame!(recurse, frame, finish!(recurse, frame, istoplevel), rootistoplevel)
     throw(ArgumentError("command $cmd not recognized"))
 end
 debug_command(frame::Frame, cmd::AbstractString, rootistoplevel::Bool=false) =

test/debug.jl

@@ -142,18 +142,28 @@ end
         end
         f_exc_inner() = error()
         fr = JuliaInterpreter.enter_call(f_exc_outer)
-        fr, pc =  debug_command(fr, "s")
-        fr, pc =  debug_command(fr, "n")
-        fr, pc =  debug_command(fr, "n")
+        fr, pc = debug_command(fr, "s")
+        fr, pc = debug_command(fr, "n")
+        fr, pc = debug_command(fr, "n")
         debug_command(fr, "finish")
         @test get_return(fr) == 2
         @test first(err_caught) isa ErrorException
+        @test stacklength(fr) == 1
+
+        err_caught = Any[nothing]
+        fr = JuliaInterpreter.enter_call(f_exc_outer)
+        fr, pc = debug_command(fr, "s")
+        debug_command(fr, "c")
+        @test get_return(root(fr)) == 2
+        @test first(err_caught) isa ErrorException
+        @test stacklength(root(fr)) == 1
 
         # Rethrow on uncaught exceptions
         f_outer() = g_inner()
         g_inner() = error()
         fr = JuliaInterpreter.enter_call(f_outer)
         @test_throws ErrorException debug_command(fr, "finish")
+        @test stacklength(fr) == 1
 
         # Break on error
         try

test/utils.jl

@@ -6,6 +6,16 @@ using JuliaInterpreter: finish_and_return!, evaluate_call!, step_expr!, shouldbr
 using Base.Meta: isexpr
 using Test, Random, SHA
 
+function stacklength(frame)
+    n = 1
+    frame = frame.callee
+    while frame !== nothing
+        n += 1
+        frame = frame.callee
+    end
+    return n
+end
+
 # Execute a frame using Julia's regular compiled-code dispatch for any :call expressions
 runframe(frame) = Some{Any}(finish_and_return!(Compiled(), frame))