Merge pull request #13253 from dotty-staging/fix-10867

Fix #10867: Normalize after applyIfParameterized in superType
scala · Sep 22, 2021 · 5e6ccc1 · 5e6ccc1
2 parents 1a84caa + a4fb041
commit 5e6ccc1
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 9 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/Types.scala b/compiler/src/dotty/tools/dotc/core/Types.scala
@@ -4109,18 +4109,17 @@ object Types {
 
     override def underlying(using Context): Type = tycon
 
-    override def superType(using Context): Type = {
-      if (ctx.period != validSuper) {
-        cachedSuper = tycon match {
+    override def superType(using Context): Type =
+      if ctx.period != validSuper then
+        validSuper = if (tycon.isProvisional) Nowhere else ctx.period
+        cachedSuper = tycon match
           case tycon: HKTypeLambda => defn.AnyType
           case tycon: TypeRef if tycon.symbol.isClass => tycon
-          case tycon: TypeProxy => tycon.superType.applyIfParameterized(args)
+          case tycon: TypeProxy =>
+            if isMatchAlias then validSuper = Nowhere
+            tycon.superType.applyIfParameterized(args).normalized
           case _ => defn.AnyType
-        }
-        validSuper = if (tycon.isProvisional) Nowhere else ctx.period
-      }
       cachedSuper
-    }
 
     override def translucentSuperType(using Context): Type = tycon match {
       case tycon: TypeRef if tycon.symbol.isOpaqueAlias =>

diff --git a/tests/pos-deep-subtype/9849.scala → ...ustom-args/allow-deep-subtypes/9849.scala b/tests/pos-deep-subtype/9849.scala → ...ustom-args/allow-deep-subtypes/9849.scala
@@ -1,4 +1,4 @@
-type *:[A, B] = A match
+type *:[A, B] = A match // error: Recursion limit exceeded.
   case (B *: x) => A
   case (x *: y) => x *: (B *: y)
   case _ => A *: B
diff --git a/tests/pos/10867.scala b/tests/pos/10867.scala
@@ -0,0 +1,49 @@
+object Test {
+  type inserts[a, as <: Tuple] <: Tuple =
+    as match
+      case EmptyTuple => (a *: EmptyTuple) *: EmptyTuple
+      case y *: ys => (a *: y *: ys) *: Tuple.Map[inserts[a, ys], [t <: Tuple] =>> y *: t]
+
+  type inserts2[a] =
+    [as <: Tuple] =>> inserts[a, as]
+
+  type A = inserts [1, EmptyTuple]
+  type B = inserts2[1][EmptyTuple]
+
+  summon[A =:= ((1 *: EmptyTuple) *: EmptyTuple)]
+  summon[B =:= ((1 *: EmptyTuple) *: EmptyTuple)]
+  summon[A =:= B]
+
+  type H[t <: Tuple] = Tuple.Concat[t, EmptyTuple]
+
+  summon[H[A] =:= H[B]]
+
+  summon[Tuple.Concat[A, EmptyTuple] =:= Tuple.Concat[B, EmptyTuple]]
+}
+
+object Minimized {
+  type Concombre[X <: Tuple, +Y <: Tuple] <: Tuple = X match {
+    case EmptyTuple => Y
+    case x1 *: xs1 => X
+  }
+
+  type inserts[a, as <: Tuple] <: Tuple =
+    as match
+      case EmptyTuple => a *: EmptyTuple
+
+  type inserts2[a] =
+    [as <: Tuple] =>> inserts[a, as]
+
+  type A = inserts [1, EmptyTuple]
+  type B = inserts2[1][EmptyTuple]
+  type C = 1 *: EmptyTuple
+
+  summon[A =:= B]
+  summon[A =:= C]
+  summon[B =:= C]
+
+  type H[t <: Tuple] = Concombre[t, EmptyTuple]
+
+  summon[H[C] =:= H[A]]
+  summon[H[C] =:= H[B]]
+}