Skip to content

Commit 911a7b2

Browse files
committed
Cleanups
1 parent db59107 commit 911a7b2

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

compiler/src/dotty/tools/dotc/core/Types.scala

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,6 +1952,7 @@ object Types {
19521952
case TypeBounds(_, hi) => hi
19531953
case st => st
19541954
}
1955+
19551956
def superTypeNormalized(using Context): Type = superType.normalized
19561957

19571958
/** Same as superType, except for two differences:
@@ -4203,30 +4204,10 @@ object Types {
42034204
cachedSuper = tycon match
42044205
case tycon: HKTypeLambda => defn.AnyType
42054206
case tycon: TypeRef if tycon.symbol.isClass => tycon
4206-
case tycon: TypeProxy =>
4207-
if isMatchAlias then validSuper = Nowhere
4208-
val was = tycon.superType.applyIfParameterized(args)
4209-
if false then
4210-
val now = was.normalized
4211-
if was ne now then
4212-
println(i"norm $was / $now")
4213-
new Error().printStackTrace()
4214-
was
4207+
case tycon: TypeProxy => tycon.superType.applyIfParameterized(args)
42154208
case _ => defn.AnyType
42164209
cachedSuper
42174210

4218-
override def superTypeNormalized(using Context) =
4219-
if ctx.period != validSuper then
4220-
validSuper = if (tycon.isProvisional) Nowhere else ctx.period
4221-
cachedSuper = tycon match
4222-
case tycon: HKTypeLambda => defn.AnyType
4223-
case tycon: TypeRef if tycon.symbol.isClass => tycon
4224-
case tycon: TypeProxy =>
4225-
if isMatchAlias then validSuper = Nowhere
4226-
tycon.superType.applyIfParameterized(args)
4227-
case _ => defn.AnyType
4228-
cachedSuper.normalized
4229-
42304211
override def translucentSuperType(using Context): Type = tycon match {
42314212
case tycon: TypeRef if tycon.symbol.isOpaqueAlias =>
42324213
tycon.translucentSuperType.applyIfParameterized(args)

0 commit comments

Comments
 (0)