Skip to content

ir: Add version of compute_trycatch for IRCode #54035

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
merged 3 commits into from
Apr 11, 2024
Merged

ir: Add version of compute_trycatch for IRCode #54035

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2d1d36
ir: Add version of compute_trycatch for IRCode
Keno Apr 11, 2024
d22e48a
Update base/compiler/inferencestate.jl
Keno Apr 11, 2024
b9e751e
Update base/compiler/inferencestate.jl
aviatesk Apr 11, 2024
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
20 changes: 19 additions & 1 deletion base/compiler/inferencestate.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,21 @@ is_inferred(result::InferenceResult) = result.result !== nothing

was_reached(sv::InferenceState, pc::Int) = sv.ssavaluetypes[pc] !== NOT_FOUND

function compute_trycatch(code::Vector{Any}, ip::BitSet)
compute_trycatch(ir::IRCode, ip::BitSet) = compute_trycatch(ir.stmts.stmt, ip, ir.cfg.blocks)

"""
compute_trycatch(code, ip [, bbs]) -> (handler_at, handlers)

Given the code of a function, compute, at every statement, the current
try/catch handler, and the current exception stack top. This function returns
a tuple of:

1. `handler_at`: A statement length vector of tuples `(catch_handler, exception_stack)`,
which are indices into `handlers`

2. `handlers`: A `TryCatchFrame` vector of handlers
"""
function compute_trycatch(code::Vector{Any}, ip::BitSet, bbs::Union{Vector{BasicBlock}, Nothing}=nothing)
# The goal initially is to record the frame like this for the state at exit:
# 1: (enter 3) # == 0
# 3: (expr) # == 1
Expand All @@ -388,6 +402,7 @@ function compute_trycatch(code::Vector{Any}, ip::BitSet)
stmt = code[pc]
if isa(stmt, EnterNode)
l = stmt.catch_dest
(bbs !== nothing) && (l = first(bbs[l].stmts))
push!(handlers, TryCatchFrame(Bottom, isdefined(stmt, :scope) ? Bottom : nothing, pc))
handler_id = length(handlers)
handler_at[pc + 1] = (handler_id, 0)
Expand All @@ -412,8 +427,10 @@ function compute_trycatch(code::Vector{Any}, ip::BitSet)
stmt = code[pc]
if isa(stmt, GotoNode)
pc´ = stmt.label
(bbs !== nothing) && (pc´ = first(bbs[pc´].stmts))
elseif isa(stmt, GotoIfNot)
l = stmt.dest::Int
(bbs !== nothing) && (l = first(bbs[l].stmts))
if handler_at[l] != cur_stacks
@assert handler_at[l][1] == 0 || handler_at[l][1] == cur_stacks[1] "unbalanced try/catch"
handler_at[l] = cur_stacks
Expand All @@ -424,6 +441,7 @@ function compute_trycatch(code::Vector{Any}, ip::BitSet)
break
elseif isa(stmt, EnterNode)
l = stmt.catch_dest
(bbs !== nothing) && (l = first(bbs[l].stmts))
# We assigned a handler number above. Here we just merge that
# with out current handler information.
if l != 0
Expand Down