inference: fix typeof-tfunc impl (#31405)

JuliaLang · Mar 21, 2019 · 604c9b2 · 604c9b2
1 parent 54fe55b
commit 604c9b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
@@ -450,7 +450,7 @@ function typeof_tfunc(@nospecialize(t))
         a = widenconst(typeof_tfunc(t.a))
         b = widenconst(typeof_tfunc(t.b))
         return Union{a, b}
-    elseif isa(t, TypeVar) && !(Any <: t.ub)
+    elseif isa(t, TypeVar) && !(Any === t.ub)
         return typeof_tfunc(t.ub)
     elseif isa(t, UnionAll)
         u = unwrap_unionall(t)

diff --git a/test/compiler/inference.jl b/test/compiler/inference.jl
@@ -1353,6 +1353,10 @@ using Core.Compiler: typeof_tfunc
 @test typeof_tfunc(Type{<:Array}) === DataType
 @test typeof_tfunc(Array{Int}) == Type{Array{Int,N}} where N
 @test typeof_tfunc(AbstractArray{Int}) == Type{<:AbstractArray{Int,N}} where N
+@test typeof_tfunc(Union{<:T, <:Real} where T<:Complex) == Union{Type{Complex{T}} where T<:Real, Type{<:Real}}
+
+f_typeof_tfunc(x) = typeof(x)
+@test Base.return_types(f_typeof_tfunc, (Union{<:T, Int} where T<:Complex,)) == Any[Union{Type{Int}, Type{Complex{T}} where T<:Real}]
 
 function f23024(::Type{T}, ::Int) where T
     1 + 1