Skip to content

Commit df049f3

Browse files
committed
ir/passes: Various followups from previous PRs
Rolls up individual review comments from #48066, #48144, #48151.
1 parent b76fdcc commit df049f3

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

base/compiler/ssair/ir.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1244,7 +1244,6 @@ function process_node!(compact::IncrementalCompact, result_idx::Int, inst::Instr
12441244
ssa_rename[idx] = stmt
12451245
else
12461246
result[result_idx][:inst] = stmt
1247-
result[result_idx][:flag] = flag
12481247
result_idx += 1
12491248
end
12501249
elseif isa(stmt, GotoNode)

base/compiler/ssair/irinterp.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function reprocess_instruction!(interp::AbstractInterpreter,
232232
(; rt, effects) = abstract_eval_statement_expr(interp, inst, nothing, ir, irsv.mi)
233233
# All other effects already guaranteed effect free by construction
234234
if is_nothrow(effects)
235-
ir.stmts[idx][:flag] |= IR_FLAG_EFFECT_FREE | IR_FLAG_NOTHROW
235+
ir.stmts[idx][:flag] |= IR_FLAG_NOTHROW
236236
if isa(rt, Const) && is_inlineable_constant(rt.val)
237237
ir.stmts[idx][:inst] = quoted(rt.val)
238238
end
@@ -242,7 +242,7 @@ function reprocess_instruction!(interp::AbstractInterpreter,
242242
if mi′ !== irsv.mi # prevent infinite loop
243243
rt, nothrow = concrete_eval_invoke(interp, inst, mi′, irsv)
244244
if nothrow
245-
ir.stmts[idx][:flag] |= IR_FLAG_EFFECT_FREE | IR_FLAG_NOTHROW
245+
ir.stmts[idx][:flag] |= IR_FLAG_NOTHROW
246246
if isa(rt, Const) && is_inlineable_constant(rt.val)
247247
ir.stmts[idx][:inst] = quoted(rt.val)
248248
end

base/compiler/ssair/passes.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,6 @@ end
805805
isa(rarg, SSAValue) || return nothing
806806
argdef = compact[rarg][:inst]
807807
else
808-
isa(arg, DataType) || return nothing
809808
isType(arg) || return nothing
810809
arg = arg.parameters[1]
811810
end

0 commit comments

Comments
 (0)