fix unlimited_type_size growth of Tuple

widen Tuple faster, to Any, if it's already nesting
tekverkp · Jan 19, 2018 · ad703e8 · ad703e8
1 parent 0379a38
commit ad703e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/base/compiler/typelimits.jl b/base/compiler/typelimits.jl
@@ -250,6 +250,9 @@ function _limit_type_size(@nospecialize(t), @nospecialize(c), sources::SimpleVec
  # never replace Vararg with non-Vararg
  return Vararg
  end
+ if allowed_tuplelen < 1 && t.name === Tuple.name
+ return Any
+ end
  widert = t.name.wrapper
  if !(t <: widert)
  # This can happen when a typevar has bounds too wide for its context, e.g.

diff --git a/test/compiler/compiler.jl b/test/compiler/compiler.jl
@@ -13,8 +13,8 @@ let comparison = Tuple{X, X} where X<:Tuple
  sig = Tuple{X, X} where X<:comparison
  ref = Tuple{X, X} where X
  @test Core.Compiler.limit_type_size(sig, comparison, comparison, 10) == comparison
- @test Core.Compiler.limit_type_size(sig, ref, comparison, 10) == comparison
- @test Core.Compiler.limit_type_size(Tuple{sig}, Tuple{ref}, comparison, 10) == Tuple{comparison}
+ @test Core.Compiler.limit_type_size(sig, ref, comparison, 10) == ref
+ @test Core.Compiler.limit_type_size(Tuple{sig}, Tuple{ref}, comparison, 10) == Tuple{ref}
  @test Core.Compiler.limit_type_size(sig, ref, Tuple{comparison}, 10) == sig
 end