Fix #31783 - Incorrect tfunc for apply_type(Union, ::TypeVar, ...) (#…

…31784)
JuliaLang · Apr 22, 2019 · c15d984 · c15d984
1 parent d16efb4
commit c15d984
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
@@ -1020,7 +1020,7 @@ function apply_type_tfunc(@nospecialize(headtypetype), @nospecialize args...)
  end
  else
  if !isType(ai)
- if !isa(ai, Type) || typeintersect(ai, Type) !== Bottom
+ if !isa(ai, Type) || typeintersect(ai, Type) !== Bottom || typeintersect(ai, TypeVar) !== Bottom
  hasnonType = true
  else
  return Bottom

diff --git a/test/core.jl b/test/core.jl
@@ -6915,3 +6915,10 @@ TupleOf31406(cols::Union{Shape31406,Type}...) = TupleOf31406(collect(Shape31406,
  end
  true
  end
+
+# Issue #31783
+struct LL31783{T}
+ x::T
+end
+foo31783(tv::TypeVar) = tv.ub == Any ? Union{tv,LL31783{tv}} : tv
+@test isa(foo31783(TypeVar(:T)),Union)