wip

Author: aviatesk

base/compiler/abstractinterpretation.jl

@@ -1249,7 +1249,13 @@ function const_prop_call(interp::AbstractInterpreter,
     inf_cache = get_inference_cache(interp)
     𝕃ᵢ = typeinf_lattice(interp)
     argtypes = has_conditional(𝕃ᵢ, sv) ? ConditionalArgtypes(arginfo, sv) : SimpleArgtypes(arginfo.argtypes)
-    given_argtypes, overridden_by_const = matching_cache_argtypes(𝕃ᵢ, mi, argtypes, result.volatile_inf_result)
+    volatile_inf_result = result.volatile_inf_result
+    if volatile_inf_result !== nothing
+        cache_argtypes = volatile_inf_result.inf_result.argtypes
+    else
+        cache_argtypes = matching_cache_argtypes(𝕃ᵢ, mi)
+    end
+    given_argtypes = matching_cache_argtypes(𝕃ᵢ, mi, argtypes, cache_argtypes)
     inf_result = cache_lookup(𝕃ᵢ, mi, given_argtypes, inf_cache)
     if inf_result !== nothing
         # found the cache for this constant prop'
@@ -1260,6 +1266,12 @@ function const_prop_call(interp::AbstractInterpreter,
         @assert inf_result.linfo === mi "MethodInstance for cached inference result does not match"
         return return_cached_result(interp, inf_result, sv)
     end
+    overridden_by_const = falses(length(given_argtypes))
+    for i = 1:length(given_argtypes)
+        if given_argtypes[i] !== cache_argtypes[i]
+            overridden_by_const[i] = true
+        end
+    end
     if !any(overridden_by_const)
         add_remark!(interp, sv, "[constprop] Could not handle constant info in matching_cache_argtypes")
         return nothing
@@ -1301,17 +1313,12 @@ as well as the other general extended lattice information.
 """
 function matching_cache_argtypes(𝕃::AbstractLattice, mi::MethodInstance,
                                  conditional_argtypes::ConditionalArgtypes,
-                                 volatile_inf_result::Union{Nothing,VolatileInferenceResult}=nothing)
+                                 cache_argtypes::Vector{Any})
     (; arginfo, sv) = conditional_argtypes
     (; fargs, argtypes) = arginfo
     given_argtypes = Vector{Any}(undef, length(argtypes))
     def = mi.def::Method
     nargs = Int(def.nargs)
-    if volatile_inf_result !== nothing
-        cache_argtypes = volatile_inf_result.inf_result.argtypes
-    else
-        cache_argtypes = matching_cache_argtypes(𝕃, mi)
-    end
     local condargs = nothing
     for i in 1:length(argtypes)
         argtype = argtypes[i]
@@ -1354,7 +1361,7 @@ function matching_cache_argtypes(𝕃::AbstractLattice, mi::MethodInstance,
     else
         given_argtypes = va_process_argtypes(𝕃, given_argtypes, mi)
     end
-    return pick_const_args(𝕃, given_argtypes, cache_argtypes)
+    return pick_const_args!(𝕃, given_argtypes, cache_argtypes)
 end
 
 # This is only for use with `Conditional`.

base/compiler/inferenceresult.jl

@@ -40,27 +40,17 @@ usages and in general `matching_cache_argtypes(::MethodInstance, ::ConditionalAr
 is more preferred it can forward `Conditional` information.
 """
 function matching_cache_argtypes(𝕃::AbstractLattice, mi::MethodInstance, simple_argtypes::SimpleArgtypes,
-                                 volatile_inf_result::Union{Nothing,VolatileInferenceResult}=nothing)
+                                 cache_argtypes::Vector{Any})
     (; argtypes) = simple_argtypes
     given_argtypes = Vector{Any}(undef, length(argtypes))
     for i = 1:length(argtypes)
         given_argtypes[i] = widenslotwrapper(argtypes[i])
     end
     given_argtypes = va_process_argtypes(𝕃, given_argtypes, mi)
-    if volatile_inf_result !== nothing
-        cache_argtypes = volatile_inf_result.inf_result.argtypes
-    else
-        cache_argtypes = matching_cache_argtypes(𝕃, mi)
-    end
-    return pick_const_args(𝕃, given_argtypes, cache_argtypes)
+    return pick_const_args!(𝕃, given_argtypes, cache_argtypes)
 end
 
-function pick_const_args(𝕃::AbstractLattice, given_argtypes::Vector{Any}, cache_argtypes::Vector{Any})
-    overridden_by_const = falses(length(cache_argtypes))
-    return pick_const_args!(𝕃, given_argtypes, cache_argtypes, overridden_by_const)
-end
-
-function pick_const_args!(𝕃::AbstractLattice, given_argtypes::Vector{Any}, cache_argtypes::Vector{Any}, overridden_by_const::BitVector)
+function pick_const_args!(𝕃::AbstractLattice, given_argtypes::Vector{Any}, cache_argtypes::Vector{Any})
     nargtypes = length(given_argtypes)
     @assert nargtypes == length(cache_argtypes) #= == nargs =# "invalid `given_argtypes` for `mi`"
     for i = 1:nargtypes
@@ -74,12 +64,11 @@ function pick_const_args!(𝕃::AbstractLattice, given_argtypes::Vector{Any}, ca
                 # declared method signature, narrow it down using `tmeet`
                 given_argtypes[i] = tmeet(𝕃, given_argtype, cache_argtype)
             end
-            overridden_by_const[i] = true
         else
             given_argtypes[i] = cache_argtype
         end
     end
-    return given_argtypes, overridden_by_const
+    return given_argtypes
 end
 
 function is_argtype_match(𝕃::AbstractLattice,