Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport] Normalize after applyIfParameterized in superType #13615

Merged
merged 4 commits into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions compiler/src/dotty/tools/dotc/core/Types.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4105,18 +4105,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 =>
Expand Down
4 changes: 0 additions & 4 deletions tests/pos-deep-subtype/9849.scala

This file was deleted.

49 changes: 49 additions & 0 deletions tests/pos/10867.scala
Original file line number Diff line number Diff line change
@@ -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]]
}