Skip to content

Commit 6151e35

Browse files
committed
Cleanups
1 parent c7e9404 commit 6151e35

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

compiler/src/dotty/tools/dotc/config/Config.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package dotty.tools.dotc.config
22

33
object Config {
44

5-
val newScheme = true
6-
75
final val cacheMembersNamed = true
86
final val cacheAsSeenFrom = true
97
final val cacheMemberNames = true

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,10 +1242,7 @@ object SymDenotations {
12421242
def opaqueAlias(implicit ctx: Context): Type = {
12431243
def recur(tp: Type): Type = tp match {
12441244
case RefinedType(parent, rname, TypeAlias(alias)) =>
1245-
if rname == name then alias match
1246-
case alias: LazyRef => alias.ref
1247-
case _ => alias
1248-
else recur(parent)
1245+
if rname == name then alias.stripLazyRef else recur(parent)
12491246
case _ =>
12501247
NoType
12511248
}

compiler/src/dotty/tools/dotc/typer/Namer.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,7 @@ class Namer { typer: Typer =>
10041004
sym.info = NoCompleter
10051005
sym.info = sym.opaqueToBounds(checkNonCyclic(sym, unsafeInfo, reportErrors = true))
10061006
}
1007-
if !Config.newScheme then sym.normalizeOpaque()
1008-
else if sym.isOpaqueAlias then sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
1007+
if sym.isOpaqueAlias then sym.typeRef.recomputeDenot() // make sure we see the new bounds from now on
10091008
sym.resetFlag(Provisional)
10101009

10111010
// Here we pay the price for the cavalier setting info to TypeBounds.empty above.

0 commit comments

Comments
 (0)