add missing @nospecialize annotation (#439)

aviatesk · Dec 14, 2022 · 027bf46 · 027bf46
1 parent 53d5afd
commit 027bf46
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/JET.jl b/src/JET.jl
@@ -520,7 +520,7 @@ JETCallResult(result::InferenceResult, analyzer::AbstractAnalyzer, source::Abstr
  return state > $(fieldcount(JETCallResult)) ? nothing : (getfield(res, state), state+1)
 
 function get_result(result::JETCallResult)
- if any(@nospecialize(r) -> isa(r, GeneratorErrorReport), get_reports(result))
+ if any(@nospecialize(r::InferenceErrorReport) -> isa(r, GeneratorErrorReport), get_reports(result))
  return Bottom
  else
  return result.result.result

diff --git a/src/abstractinterpret/abstractanalyzer.jl b/src/abstractinterpret/abstractanalyzer.jl
@@ -536,18 +536,18 @@ get_any_reports(analyzer::AbstractAnalyzer, result::InferenceResult) = (analyzer
 
 Adds new [`report::InferenceErrorReport`](@ref InferenceErrorReport) associated with `result::InferenceResult`.
 """
-function add_new_report!(analyzer::AbstractAnalyzer, result::InferenceResult, report::InferenceErrorReport)
+function add_new_report!(analyzer::AbstractAnalyzer, result::InferenceResult, @nospecialize(report::InferenceErrorReport))
  push!(get_reports(analyzer, result), report)
  return report
 end
 
-function add_cached_report!(analyzer::AbstractAnalyzer, caller::InferenceResult, cached::InferenceErrorReport)
+function add_cached_report!(analyzer::AbstractAnalyzer, caller::InferenceResult, @nospecialize(cached::InferenceErrorReport))
  cached = copy_report′(cached)
  push!(get_reports(analyzer, caller), cached)
  return cached
 end
 
-add_caller_cache!(analyzer::AbstractAnalyzer, report::InferenceErrorReport) = push!(get_caller_cache(analyzer), report)
+add_caller_cache!(analyzer::AbstractAnalyzer, @nospecialize(report::InferenceErrorReport)) = push!(get_caller_cache(analyzer), report)
 add_caller_cache!(analyzer::AbstractAnalyzer, reports::Vector{InferenceErrorReport}) = append!(get_caller_cache(analyzer), reports)
 
 # AbstractInterpreter
@@ -628,7 +628,7 @@ ignores the identity of error point's `MethodInstance`, under the assumption tha
 identical as far as they're collected at the same file and line.
 """
 aggregation_policy(::AbstractAnalyzer) = default_aggregation_policy
-function default_aggregation_policy(@nospecialize(report#=::InferenceErrorReport=#))
+function default_aggregation_policy(@nospecialize(report::InferenceErrorReport))
  return DefaultReportIdentity(
  typeof(Base.inferencebarrier(report))::DataType,
  report.sig,

diff --git a/src/abstractinterpret/inferenceerrorreport.jl b/src/abstractinterpret/inferenceerrorreport.jl
@@ -473,7 +473,7 @@ report_color(::InferenceErrorReport) = ERROR_COLOR
 # ------
 
 # to help inference
-function Base.getproperty(er::InferenceErrorReport, sym::Symbol)
+@inline function Base.getproperty(@nospecialize(er::InferenceErrorReport), sym::Symbol)
  return if sym === :vst
  getfield(er, sym)::VirtualStackTrace
  elseif sym === :sig

diff --git a/src/abstractinterpret/typeinfer.jl b/src/abstractinterpret/typeinfer.jl
@@ -529,6 +529,7 @@ because it is not detected within `linfo3` but within `linfo1` (so it's not a "l
 """
 function islineage(parent::MethodInstance, current::MethodInstance)
  function (report::InferenceErrorReport)
+ @nospecialize report
  @inbounds begin
  vst = report.vst
  length(vst) > 1 || return false

diff --git a/src/analyzers/jetanalyzer.jl b/src/analyzers/jetanalyzer.jl
@@ -515,7 +515,9 @@ function (::BasicPass)(::Type{UncaughtExceptionReport}, analyzer::JETAnalyzer, f
  # (if exists) are caught and not propagated here
  # we don't want to cache the caught `UncaughtExceptionReport`s for this frame and
  # its parents, and just filter them away now
- filter!(report->!isa(report, UncaughtExceptionReport), get_reports(analyzer, frame.result))
+ filter!(get_reports(analyzer, frame.result)) do @nospecialize(report::InferenceErrorReport)
+ return !isa(report, UncaughtExceptionReport)
+ end
  end
  return false
 end