effects: audit EFFECTS_UNKNOWN usages (JuliaLang#50106)

inkydragon · Jun 9, 2023 · 43d7f88 · 43d7f88
1 parent d041162
commit 43d7f88
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/base/compiler/abstractinterpretation.jl b/base/compiler/abstractinterpretation.jl
@@ -1875,7 +1875,7 @@ function abstract_call_unionall(interp::AbstractInterpreter, argtypes::Vector{An
  ret = canconst ? Const(body) : Type{body}
  return CallMeta(ret, Effects(EFFECTS_TOTAL; nothrow), NoCallInfo())
  end
- return CallMeta(Any, EFFECTS_UNKNOWN, NoCallInfo())
+ return CallMeta(Bottom, EFFECTS_THROWS, NoCallInfo())
 end
 
 function abstract_invoke(interp::AbstractInterpreter, (; fargs, argtypes)::ArgInfo, si::StmtInfo, sv::AbsIntState)
@@ -1987,7 +1987,7 @@ function abstract_call_known(interp::AbstractInterpreter, @nospecialize(f),
  elseif f === TypeVar
  # Manually look through the definition of TypeVar to
  # make sure to be able to get `PartialTypeVar`s out.
- (la < 2 || la > 4) && return CallMeta(Union{}, EFFECTS_UNKNOWN, NoCallInfo())
+ (la < 2 || la > 4) && return CallMeta(Bottom, EFFECTS_THROWS, NoCallInfo())
  n = argtypes[2]
  ub_var = Const(Any)
  lb_var = Const(Union{})
@@ -2301,7 +2301,7 @@ end
 
 function abstract_eval_statement_expr(interp::AbstractInterpreter, e::Expr, vtypes::Union{VarTable,Nothing},
  sv::AbsIntState)
- effects = EFFECTS_UNKNOWN
+ effects = Effects()
  ehead = e.head
  𝕃ᵢ = typeinf_lattice(interp)
  ⊑ᵢ = ⊑(𝕃ᵢ)

diff --git a/base/compiler/effects.jl b/base/compiler/effects.jl
@@ -131,7 +131,7 @@ const INACCESSIBLEMEM_OR_ARGMEMONLY = 0x01 << 1
 
 const EFFECTS_TOTAL = Effects(ALWAYS_TRUE, ALWAYS_TRUE, true, true, true, ALWAYS_TRUE, true, true)
 const EFFECTS_THROWS = Effects(ALWAYS_TRUE, ALWAYS_TRUE, false, true, true, ALWAYS_TRUE, true, true)
-const EFFECTS_UNKNOWN = Effects(ALWAYS_FALSE, ALWAYS_FALSE, false, false, false, ALWAYS_FALSE, true, false) # unknown mostly, but it's not overlayed at least (e.g. it's not a call)
+const EFFECTS_UNKNOWN = Effects(ALWAYS_FALSE, ALWAYS_FALSE, false, false, false, ALWAYS_FALSE, true, true) # unknown mostly, but it's not overlayed and noinbounds at least (e.g. it's not a call)
 const _EFFECTS_UNKNOWN = Effects(ALWAYS_FALSE, ALWAYS_FALSE, false, false, false, ALWAYS_FALSE, false, false) # unknown really
 
 function Effects(e::Effects = _EFFECTS_UNKNOWN;

diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
@@ -1374,7 +1374,7 @@ function abstract_modifyfield!(interp::AbstractInterpreter, argtypes::Vector{Any
  nargs = length(argtypes)
  if !isempty(argtypes) && isvarargtype(argtypes[nargs])
  nargs - 1 <= 6 || return CallMeta(Bottom, EFFECTS_THROWS, NoCallInfo())
- nargs > 3 || return CallMeta(Any, EFFECTS_UNKNOWN, NoCallInfo())
+ nargs > 3 || return CallMeta(Any, Effects(), NoCallInfo())
  else
  5 <= nargs <= 6 || return CallMeta(Bottom, EFFECTS_THROWS, NoCallInfo())
  end
@@ -2681,7 +2681,7 @@ end
 # a simplified model of abstract_call_gf_by_type for applicable
 function abstract_applicable(interp::AbstractInterpreter, argtypes::Vector{Any},
  sv::AbsIntState, max_methods::Int)
- length(argtypes) < 2 && return CallMeta(Union{}, EFFECTS_UNKNOWN, NoCallInfo())
+ length(argtypes) < 2 && return CallMeta(Bottom, EFFECTS_THROWS, NoCallInfo())
  isvarargtype(argtypes[2]) && return CallMeta(Bool, EFFECTS_UNKNOWN, NoCallInfo())
  argtypes = argtypes[2:end]
  atype = argtypes_to_type(argtypes)