Fixes for non-linearized cglobal

base/compiler/optimize.jl

@@ -243,6 +243,10 @@ function stmt_effect_flags(lattice::AbstractLattice, @nospecialize(stmt), @nospe
  nothrow = _builtin_nothrow(lattice, f, argtypes, rt)
  return (true, nothrow, nothrow)
  end
+ if f === Intrinsics.cglobal
+ # TODO: these are not yet linearized
+ return (false, false, false)
+ end
  isa(f, Builtin) || return (false, false, false)
  # Needs to be handled in inlining to look at the callee effects
  f === Core._apply_iterate && return (false, false, false)

base/compiler/ssair/verify.jl

@@ -39,7 +39,6 @@ function check_op(ir::IRCode, domtree::DomTree, @nospecialize(op), use_bb::Int,
  else
  if !dominates(domtree, def_bb, use_bb) && !(bb_unreachable(domtree, def_bb) && bb_unreachable(domtree, use_bb))
  # At the moment, we allow GC preserve tokens outside the standard domination notion
- #@Base.show ir
  @verify_error "Basic Block $def_bb does not dominate block $use_bb (tried to use value $(op.id))"
  error("")
  end
@@ -62,7 +61,6 @@ function check_op(ir::IRCode, domtree::DomTree, @nospecialize(op), use_bb::Int,
  end
  end
  elseif isa(op, Union{OldSSAValue, NewSSAValue})
- #@Base.show ir
  @verify_error "Left over SSA marker"
  error("")
  elseif isa(op, Union{SlotNumber, TypedSlot})
@@ -245,6 +243,12 @@ function verify_ir(ir::IRCode, print::Bool=true, allow_frontend_forms::Bool=fals
  (stmt.args[1] isa GlobalRef || (stmt.args[1] isa Expr && stmt.args[1].head === :static_parameter))
  # a GlobalRef or static_parameter isdefined check does not evaluate its argument
  continue
+ elseif stmt.head === :call
+ f = stmt.args[1]
+ if f isa GlobalRef && f.name === :cglobal
+ # TODO: these are not yet linearized
+ continue
+ end
  end
  end
  n = 1

test/compiler/inference.jl

@@ -4233,3 +4233,14 @@ function unused_apply_iterate()
  return nothing
 end
 @test fully_eliminated(unused_apply_iterate, ())
+
+@testset "#45956: non-linearized cglobal needs special treatment for stmt effects" begin
+ function foo()
+ cglobal((a, ))
+ ccall(0, Cvoid, (Nothing,), b)
+ end
+ @test only(code_typed() do
+ cglobal((a, ))
+ ccall(0, Cvoid, (Nothing,), b)
+ end)[2] === Nothing
+end

test/compiler/ssair.jl

@@ -173,7 +173,17 @@ let ci = make_ci([
  ])
  ir = Core.Compiler.inflate_ir(ci)
  ir = Core.Compiler.compact!(ir, true)
- @test Core.Compiler.verify_ir(ir) == nothing
+ @test Core.Compiler.verify_ir(ir) === nothing
+end
+
+# Test that the verifier doesn't choke on cglobals (which aren't linearized)
+let ci = make_ci([
+ Expr(:call, GlobalRef(Main, :cglobal),
+ Expr(:call, Core.tuple, :(:c)), Nothing),
+ Core.Compiler.ReturnNode()
+ ])
+ ir = Core.Compiler.inflate_ir(ci)
+ @test Core.Compiler.verify_ir(ir) === nothing
 end
 
 # Test that GlobalRef in value position is non-canonical