Skip to content

codeedges: Rename implicit returns to termination points #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aviatesk merged 1 commit into from
Jun 23, 2026
Merged

codeedges: Rename implicit returns to termination points #154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/codeedges.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ end
When this object is passed as the `recurse` argument of `selective_eval!`,
the selective execution is adjusted as follows:

- **Implicit return**: In Julia's IR representation (`CodeInfo`), the final block does not
necessarily return and may `goto` another block. In such cases the actual `return` is an
explicit statement earlier in the code, and if the slice does not include it,
`selective_eval!` must still terminate when execution reaches it. `controller.implicit_returns`
records the PCs of such `return` statements, and `selective_eval!` will return when reaching them.
- **Termination point**: In Julia's IR representation (`CodeInfo`), a terminal
basic block may contain a statement that is outside the slice but should still
terminate selective execution when reached. `controller.termination_points`
records the PCs of such statements, and `selective_eval!` will return when
reaching them.

- **CFG short-cut**: When the successors of a conditional branch are inactive, and it is
safe to move the program counter from the conditional branch to the nearest common
Expand All @@ -212,7 +212,7 @@ These adjustments are necessary for performing selective execution correctly.
passed as an argument to be appropriate for the program slice generated.
"""
struct SelectiveEvalController
implicit_returns::BitSet # pc where selective execution should terminate even if they're inactive
termination_points::BitSet # inactive PCs where selective execution terminates
shortcuts::Vector{CFGShortCut}
end
SelectiveEvalController() = SelectiveEvalController(BitSet(), CFGShortCut[])
Expand Down Expand Up @@ -764,8 +764,8 @@ function lines_required!(isrequired::AbstractVector{Bool}, objs, src::CodeInfo,
# now mark the active goto nodes
add_active_gotos!(isrequired, src, cfg, postdomtree, controller)

# check if there are any implicit return blocks
record_implicit_return!(controller, isrequired, cfg)
# check if there are any termination points
record_termination_points!(controller, isrequired, cfg)

return isrequired
end
Expand Down Expand Up @@ -982,13 +982,13 @@ function compute_dead_blocks!(isrequired, src::CodeInfo, cfg::CFG, postdomtree,
return dead_blocks
end

function record_implicit_return!(controller::SelectiveEvalController, isrequired, cfg::CFG)
function record_termination_points!(controller::SelectiveEvalController, isrequired, cfg::CFG)
for bbidx = 1:length(cfg.blocks)
bb = cfg.blocks[bbidx]
if isempty(bb.succs)
i = findfirst(idx::Int->!isrequired[idx], bb.stmts)
if !isnothing(i)
push!(controller.implicit_returns, bb.stmts[i])
push!(controller.termination_points, bb.stmts[i])
end
end
end
Expand Down Expand Up @@ -1119,7 +1119,7 @@ end

function JuliaInterpreter.step_expr!(interp::SelectiveInterpreter, frame::Frame, istoplevel::Bool)
pc = frame.pc
if pc in interp.controller.implicit_returns
if pc in interp.controller.termination_points
return nothing
elseif pc_expr(frame) isa GotoIfNot
for shortcut in interp.controller.shortcuts
Expand Down
Loading