Fixes to 5e92b7d

JuliaLang · May 11, 2022 · fa66298 · fa66298
1 parent 654f68c
commit fa66298
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/base/compiler/ssair/inlining.jl b/base/compiler/ssair/inlining.jl
@@ -1275,7 +1275,7 @@ function analyze_single_call!(
             end
         end
         for (j, match) in enumerate(meth)
-            if !isdispatchtuple(match.spec_types)
+            if !validate_sparams(match.sparams)
                 if !match.fully_covers
                     handled_all_cases = false
                     continue
@@ -1366,15 +1366,14 @@ function handle_const_call!(
             j += 1
             result = results[j]
             any_fully_covered |= match.fully_covers
-            check_sparams = isa(only_method, Bool) # validate sparams if we know this meth has >1 match
             if isa(result, ConcreteResult)
                 case = concrete_result_item(result, state)
                 push!(cases, InliningCase(result.mi.specTypes, case))
             elseif isa(result, ConstPropResult)
-                handled_all_cases &= handle_const_prop_result!(result, argtypes, flag, state, cases, true, check_sparams)
+                handled_all_cases &= handle_const_prop_result!(result, argtypes, flag, state, cases, true, true)
             else
                 @assert result === nothing
-                handled_all_cases &= handle_match!(match, argtypes, flag, state, cases, true, check_sparams)
+                handled_all_cases &= handle_match!(match, argtypes, flag, state, cases, true, true)
             end
         end
     end