inference: don't widen DataType/UninAll to Type within `tuple_t…

…func` (JuliaLang#44896) Follows up JuliaLang#44725.
tekverkp · Apr 11, 2022 · 0deb326 · 0deb326
1 parent bb91e62
commit 0deb326
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
@@ -1558,6 +1558,8 @@ function tuple_tfunc(argtypes::Vector{Any})
  else
  params[i] = Type
  end
+ elseif iskindtype(x)
+ params[i] = x
  elseif !isvarargtype(x) && hasintersect(x, Type)
  params[i] = Union{x, Type}
  else

diff --git a/test/compiler/inference.jl b/test/compiler/inference.jl
@@ -1569,6 +1569,8 @@ let tuple_tfunc
  @test Core.Compiler.widenconst(tuple_tfunc(Type{Int})) === Tuple{DataType}
  # https://github.com/JuliaLang/julia/issues/44705
  @test tuple_tfunc(Union{Type{Int32},Type{Int64}}) === Tuple{Type}
+ @test tuple_tfunc(DataType) === Tuple{DataType}
+ @test tuple_tfunc(UnionAll) === Tuple{UnionAll}
 end
 
 function f23024(::Type{T}, ::Int) where T