Skip to content

Avoid creating invalid PhiNodes in IR passes #50235

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
Keno merged 1 commit into from
Jun 21, 2023
Merged

Avoid creating invalid PhiNodes in IR passes #50235

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
2 changes: 1 addition & 1 deletion base/compiler/ssair/irinterp.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function reprocess_instruction!(interp::AbstractInterpreter, idx::Int, bb::Union
if rt !== nothing
if isa(rt, Const)
ir.stmts[idx][:type] = rt
if is_inlineable_constant(rt.val) && (ir.stmts[idx][:flag] & IR_FLAG_EFFECT_FREE) != 0
if is_inlineable_constant(rt.val) && !isa(inst, PhiNode) && (ir.stmts[idx][:flag] & IR_FLAG_EFFECT_FREE) != 0
ir.stmts[idx][:inst] = quoted(rt.val)
end
return true
Expand Down
11 changes: 10 additions & 1 deletion base/compiler/ssair/passes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2246,6 +2246,7 @@ function cfg_simplify!(ir::IRCode)
result_idx = 1
for (idx, orig_bb) in enumerate(result_bbs)
ms = orig_bb
bb_start = true
while ms != 0
for i in bbs[ms].stmts
node = ir.stmts[i]
Expand Down Expand Up @@ -2304,7 +2305,14 @@ function cfg_simplify!(ir::IRCode)
isassigned(renamed_values, old_index) && kill_current_use!(compact, renamed_values[old_index])
end
end
compact.result[compact.result_idx][:inst] = PhiNode(edges, values)
if length(edges) == 0 || (length(edges) == 1 && !isassigned(values, 1))
compact.result[compact.result_idx][:inst] = nothing
elseif length(edges) == 1 && !bb_start
compact.result[compact.result_idx][:inst] = values[1]
else
@assert bb_start
compact.result[compact.result_idx][:inst] = PhiNode(edges, values)
end
else
ri = process_node!(compact, compact.result_idx, node, i, i, ms, true)
if ri == compact.result_idx
Expand All @@ -2318,6 +2326,7 @@ function cfg_simplify!(ir::IRCode)
compact.result_idx += 1
end
ms = merged_succ[ms]
bb_start = false
end
end
compact.idx = length(ir.stmts)
Expand Down