Skip to content

Commit 7d8d038

Browse files
committed
Change the default to recursive for debug_command
1 parent 70a4c95 commit 7d8d038

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/commands.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,18 @@ or one of the 'advanced' commands
309309
- "sg": step into the generator of a generated function
310310
311311
`rootistoplevel` and `ret` are as described for [`JuliaInterpreter.maybe_reset_frame!`](@ref).
312-
Unlike other commands, the default setting for `recurse` is `Compiled()`.
313312
"""
314313
function debug_command(@nospecialize(recurse), frame::Frame, cmd::AbstractString, rootistoplevel::Bool=false)
315314
istoplevel = rootistoplevel && frame.caller === nothing
316315
if cmd == "si"
317316
stmt = pc_expr(frame)
318317
cmd = is_call(stmt) ? "s" : "se"
319318
end
320-
try
319+
try
321320
cmd == "nc" && return maybe_reset_frame!(recurse, frame, next_call!(recurse, frame, istoplevel), rootistoplevel)
322321
cmd == "n" && return maybe_reset_frame!(recurse, frame, next_line!(recurse, frame, istoplevel), rootistoplevel)
323322
cmd == "se" && return maybe_reset_frame!(recurse, frame, step_expr!(recurse, frame, istoplevel), rootistoplevel)
324-
323+
325324
enter_generated = false
326325
if cmd == "sg"
327326
enter_generated = true
@@ -337,7 +336,7 @@ function debug_command(@nospecialize(recurse), frame::Frame, cmd::AbstractString
337336
ret = evaluate_call!(dummy_breakpoint, frame, stmt; enter_generated=enter_generated)
338337
isa(ret, BreakpointRef) && return maybe_reset_frame!(recurse, frame, ret, rootistoplevel)
339338
maybe_assign!(frame, stmt0, ret)
340-
frame.pc = ret + 1
339+
frame.pc += 1
341340
return frame, frame.pc
342341
end
343342
if cmd == "c"
@@ -357,4 +356,4 @@ function debug_command(@nospecialize(recurse), frame::Frame, cmd::AbstractString
357356
throw(ArgumentError("command $cmd not recognized"))
358357
end
359358
debug_command(frame::Frame, cmd::AbstractString, rootistoplevel::Bool=false) =
360-
debug_command(Compiled(), frame, cmd, rootistoplevel)
359+
debug_command(finish_and_return!, frame, cmd, rootistoplevel)

0 commit comments

Comments
 (0)