Validate linfo in asserts builds, and abort on errors.

JuliaLang · Jan 13, 2024 · 011becb · 011becb
1 parent 8ef828b
commit 011becb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/base/compiler/inferencestate.jl b/base/compiler/inferencestate.jl
@@ -479,7 +479,7 @@ function InferenceState(result::InferenceResult, cache_mode::UInt8, interp::Abst
  world = get_world_counter(interp)
  src = retrieve_code_info(result.linfo, world)
  src === nothing && return nothing
- validate_code_in_debug_mode(result.linfo, src, "lowered")
+ maybe_validate_code(result.linfo, src, "lowered")
  return InferenceState(result, src, cache_mode, interp)
 end
 InferenceState(result::InferenceResult, cache_mode::Symbol, interp::AbstractInterpreter) =

diff --git a/base/compiler/optimize.jl b/base/compiler/optimize.jl
@@ -74,8 +74,6 @@ is_declared_inline(@nospecialize src::MaybeCompressed) =
 is_declared_noinline(@nospecialize src::MaybeCompressed) =
  ccall(:jl_ir_flag_inlining, UInt8, (Any,), src) == 2
 
-is_asserts() = ccall(:jl_is_assertsbuild, Cint, ()) == 1
-
 #####################
 # OptimizationState #
 #####################
@@ -188,7 +186,7 @@ function ir_to_codeinf!(opt::OptimizationState)
  (; linfo, src) = opt
  src = ir_to_codeinf!(src, opt.ir::IRCode)
  opt.ir = nothing
- validate_code_in_debug_mode(linfo, src, "optimized")
+ maybe_validate_code(linfo, src, "optimized")
  return src
 end
 
@@ -937,7 +935,10 @@ function run_passes_ipo_safe(
  @pass "compact 3" ir = compact!(ir, true)
  end
  if is_asserts()
- @timeit "verify 3" (verify_ir(ir, true, false, optimizer_lattice(sv.inlining.interp)); verify_linetable(ir.linetable))
+ @timeit "verify 3" begin
+ verify_ir(ir, true, false, optimizer_lattice(sv.inlining.interp))
+ verify_linetable(ir.linetable)
+ end
  end
  @label __done__ # used by @pass
  return ir

diff --git a/base/compiler/typeinfer.jl b/base/compiler/typeinfer.jl
@@ -581,7 +581,7 @@ function finish(me::InferenceState, interp::AbstractInterpreter)
  end
  end
 
- validate_code_in_debug_mode(me.linfo, me.src, "inferred")
+ maybe_validate_code(me.linfo, me.src, "inferred")
  nothing
 end
 

diff --git a/base/compiler/utilities.jl b/base/compiler/utilities.jl
@@ -520,6 +520,7 @@ end
 is_root_module(m::Module) = false
 
 inlining_enabled() = (JLOptions().can_inline == 1)
+
 function coverage_enabled(m::Module)
  generating_output() && return false # don't alter caches
  cov = JLOptions().code_coverage
@@ -533,9 +534,12 @@ function coverage_enabled(m::Module)
  end
  return false
 end
+
 function inbounds_option()
  opt_check_bounds = JLOptions().check_bounds
  opt_check_bounds == 0 && return :default
  opt_check_bounds == 1 && return :on
  return :off
 end
+
+is_asserts() = ccall(:jl_is_assertsbuild, Cint, ()) == 1
diff --git a/base/compiler/validation.jl b/base/compiler/validation.jl
@@ -61,9 +61,8 @@ struct InvalidCodeError <: Exception
 end
 InvalidCodeError(kind::AbstractString) = InvalidCodeError(kind, nothing)
 
-function validate_code_in_debug_mode(linfo::MethodInstance, src::CodeInfo, kind::String)
- if ccall(:jl_is_debugbuild, Cint, ()) == 1
- # this is a debug build of julia, so let's validate linfo
+function maybe_validate_code(linfo::MethodInstance, src::CodeInfo, kind::String)
+ if is_asserts()
  errors = validate_code(linfo, src)
  if !isempty(errors)
  for e in errors
@@ -75,6 +74,7 @@ function validate_code_in_debug_mode(linfo::MethodInstance, src::CodeInfo, kind:
  linfo.def, ": ", e)
  end
  end
+ error("")
  end
  end
 end