Merge pull request #43797 from ianatol/ia/condfolding

Allow branch folding to look at type information, fix Conditional bug

base/compiler/optimize.jl

@@ -402,7 +402,8 @@ function finish(interp::AbstractInterpreter, opt::OptimizationState,
  force_noinline = _any(@nospecialize(x) -> isexpr(x, :meta) && x.args[1] === :noinline, ir.meta)
 
  # compute inlining and other related optimizations
- if (isa(result, Const) || isconstType(result))
+ wresult = isa(result, InterConditional) ? widenconditional(result) : result
+ if (isa(wresult, Const) || isconstType(wresult))
  proven_pure = false
  # must be proven pure to use constant calling convention;
  # otherwise we might skip throwing errors (issue #20704)
@@ -436,14 +437,14 @@ function finish(interp::AbstractInterpreter, opt::OptimizationState,
  # Still set pure flag to make sure `inference` tests pass
  # and to possibly enable more optimization in the future
  src.pure = true
- if isa(result, Const)
- val = result.val
+ if isa(wresult, Const)
+ val = wresult.val
  if is_inlineable_constant(val)
  analyzed = ConstAPI(val)
  end
  else
- @assert isconstType(result)
- analyzed = ConstAPI(result.parameters[1])
+ @assert isconstType(wresult)
+ analyzed = ConstAPI(wresult.parameters[1])
  end
  force_noinline || (src.inlineable = true)
  end

base/compiler/ssair/ir.jl

@@ -1007,7 +1007,13 @@ function process_node!(compact::IncrementalCompact, result_idx::Int, inst::Instr
  stmt = renumber_ssa2!(stmt, ssa_rename, used_ssas, late_fixup, result_idx, do_rename_ssa)::GotoIfNot
  result[result_idx][:inst] = stmt
  cond = stmt.cond
- if isa(cond, Bool) && compact.fold_constant_branches
+ if compact.fold_constant_branches
+ if !isa(cond, Bool)
+ condT = widenconditional(argextype(cond, compact))
+ isa(condT, Const) || @goto bail
+ cond = condT.val
+ isa(cond, Bool) || @goto bail
+ end
  if cond
  result[result_idx][:inst] = nothing
  kill_edge!(compact, active_bb, active_bb, stmt.dest)
@@ -1018,6 +1024,7 @@ function process_node!(compact::IncrementalCompact, result_idx::Int, inst::Instr
  result_idx += 1
  end
  else
+ @label bail
  result[result_idx][:inst] = GotoIfNot(cond, compact.bb_rename_succ[stmt.dest])
  result_idx += 1
  end

test/compiler/inline.jl

@@ -884,3 +884,10 @@ end
 # have_fma elimination inside ^
 f_pow() = ^(2.0, -1.0)
 @test fully_eliminated(f_pow, Tuple{})
+
+# bug where Conditional wasn't being properly marked as ConstAPI
+let
+ @noinline fcond(a, b) = a === b
+ ftest(a) = (fcond(a, nothing); a)
+ @test fully_eliminated(ftest, Tuple{Bool})
+end

test/compiler/irpasses.jl

@@ -758,3 +758,18 @@ let # effect-freeness computation for array allocation
  nothing
  end
 end
+
+# allow branch folding to look at type information
+let ci = code_typed1(optimize=false) do
+ cond = 1 + 1 == 2
+ if !cond
+ gcd(24, 36)
+ else
+ gcd(64, 128)
+ end
+ end
+ ir = Core.Compiler.inflate_ir(ci)
+ @test count(@nospecialize(stmt)->isa(stmt, Core.GotoIfNot), ir.stmts.inst) == 1
+ ir = Core.Compiler.compact!(ir, true)
+ @test count(@nospecialize(stmt)->isa(stmt, Core.GotoIfNot), ir.stmts.inst) == 0
+end