Fix hang in tmerge_types_slow (#55757)

Fixes #55751 Co-authored-by: Jameson Nash <[email protected]>
JuliaLang · Sep 16, 2024 · 753296e · 753296e
1 parent 55c40ce
commit 753296e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/base/compiler/typelimits.jl b/base/compiler/typelimits.jl
@@ -831,6 +831,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
@@ -6141,3 +6141,14 @@ end == TypeError
 @test Base.infer_exception_type((Vector{Any},)) do args
     Core.throw_methoderror(args...)
 end == Union{MethodError,ArgumentError}
+
+# Issue https://github.com/JuliaLang/julia/issues/55751
+
+abstract type AbstractGrid55751{T, N} <: AbstractArray{T, N} end
+struct Grid55751{T, N, AT} <: AbstractGrid55751{T, N}
+    axes::AT
+end
+
+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