Fix hang in tmerge_types_slow (#55757)

Fixes #55751 Co-authored-by: Jameson Nash <[email protected]> (cherry picked from commit 753296e)
JuliaLang · Sep 16, 2024 · 41b225a · 41b225a
1 parent a29fae6
commit 41b225a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/base/compiler/typelimits.jl b/base/compiler/typelimits.jl
@@ -815,6 +815,7 @@ end
                     typenames[i] = Any.name
                     simplify[i] = false
                     types[j] = widen
+                    typenames[j] = ijname
                     break
                 end
             end

diff --git a/test/compiler/inference.jl b/test/compiler/inference.jl
@@ -5671,3 +5671,7 @@ end
 
 # fieldcount on `Tuple` should constant fold, even though `.fields` not const
 @test fully_eliminated(Base.fieldcount, Tuple{Type{Tuple{Nothing, Int, Int}}})
+
+t155751 = Union{AbstractArray{UInt8, 4}, Array{Float32, 4}, Grid55751{Float32, 3, _A} where _A}
+t255751 = Array{Float32, 3}
+@test Core.Compiler.tmerge_types_slow(t155751,t255751) == AbstractArray # shouldn't hang