Skip to content

cfg_simplify: Add one more check to avoid merging :leave terminator #52621

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 1 commit into from
Dec 23, 2023
Merged

cfg_simplify: Add one more check to avoid merging :leave terminator #52621

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions base/compiler/ssair/passes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2140,10 +2140,10 @@ function legalize_bb_drop_pred!(ir::IRCode, bb::BasicBlock, bbidx::Int, bbs::Vec
end
ir[last_fallthrough_term_ssa] = nothing
kill_edge!(bbs, last_fallthrough, terminator.dest)
elseif isa(terminator, EnterNode)
return false
elseif isa(terminator, GotoNode)
return true
elseif isterminator(terminator)
return false
end
# Hack, but effective. If we have a predecessor with a fall-through terminator, change the
# instruction numbering to merge the blocks now such that below processing will properly
Expand Down
4 changes: 2 additions & 2 deletions test/compiler/irpasses.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ let code = Any[
# Block 2
EnterNode(4),
# Block 3
Expr(:leave),
Expr(:leave, SSAValue(2)),
# Block 4
GotoNode(5),
# Block 5
Expand All @@ -1603,7 +1603,7 @@ let code = Any[
ir = make_ircode(code)
ir = Core.Compiler.cfg_simplify!(ir)
Core.Compiler.verify_ir(ir)
@test length(ir.cfg.blocks) == 4
@test length(ir.cfg.blocks) <= 5
end

# Test CFG simplify with single predecessor phi node
Expand Down