From 5b5fabaa81028b927cad7fdedb739554721fedef Mon Sep 17 00:00:00 2001 From: Shuhei Kadowaki Date: Wed, 25 May 2022 16:52:23 +0900 Subject: [PATCH] fix #45440, improve the robustness of concrete-evaled callsite inlining --- base/compiler/ssair/inlining.jl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/base/compiler/ssair/inlining.jl b/base/compiler/ssair/inlining.jl index 8b9cdfe7cf21a..1294fabfed74c 100644 --- a/base/compiler/ssair/inlining.jl +++ b/base/compiler/ssair/inlining.jl @@ -788,20 +788,20 @@ end function compileable_specialization(et::Union{EdgeTracker, Nothing}, match::MethodMatch, effects::Effects) mi = specialize_method(match; compilesig=true) - mi !== nothing && et !== nothing && push!(et, mi::MethodInstance) mi === nothing && return nothing + et !== nothing && push!(et, mi) return InvokeCase(mi, effects) end function compileable_specialization(et::Union{EdgeTracker, Nothing}, linfo::MethodInstance, effects::Effects) mi = specialize_method(linfo.def::Method, linfo.specTypes, linfo.sparam_vals; compilesig=true) - mi !== nothing && et !== nothing && push!(et, mi::MethodInstance) mi === nothing && return nothing + et !== nothing && push!(et, mi) return InvokeCase(mi, effects) end -function compileable_specialization(et::Union{EdgeTracker, Nothing}, (; linfo)::InferenceResult, effects::Effects) - return compileable_specialization(et, linfo, effects) +function compileable_specialization(et::Union{EdgeTracker, Nothing}, result::InferenceResult, effects::Effects) + return compileable_specialization(et, result.linfo, effects) end function resolve_todo(todo::InliningTodo, state::InliningState, flag::UInt8) @@ -1283,7 +1283,11 @@ function handle_const_call!( any_fully_covered |= match.fully_covers if isa(result, ConcreteResult) case = concrete_result_item(result, state) - push!(cases, InliningCase(result.mi.specTypes, case)) + if case === nothing + handled_all_cases = false + else + push!(cases, InliningCase(result.mi.specTypes, case)) + end elseif isa(result, ConstPropResult) handled_all_cases &= handle_const_prop_result!(result, argtypes, flag, state, cases, true) else