From 357a84870799951321636afc981cda5f4f7f6b05 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Thu, 21 Mar 2019 17:19:21 -0400
Subject: [PATCH] inference: fix typeof-tfunc impl (#31405)

(cherry picked from commit 604c9b26742decd4ce373b4dc0be36c4b0e5c632)
---
 base/compiler/tfuncs.jl   | 2 +-
 test/compiler/compiler.jl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
index b5e869ba7370a5..050d18fa1dc1bf 100644
--- a/base/compiler/tfuncs.jl
+++ b/base/compiler/tfuncs.jl
@@ -392,7 +392,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)
         return rewrap_unionall(widenconst(typeof_tfunc(unwrap_unionall(t))), t)
diff --git a/test/compiler/compiler.jl b/test/compiler/compiler.jl
index 791c73a61f7dbf..5788c0a34dec00 100644
--- a/test/compiler/compiler.jl
+++ b/test/compiler/compiler.jl
@@ -1339,6 +1339,11 @@ let egal_tfunc
     @test egal_tfunc(Union{Int64, Float64}, AbstractArray) === Const(false)
 end
 
+@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
 end