Skip to content

Commit 4b6f6a5

Browse files
committed
Fix rename breakage
1 parent b82f7eb commit 4b6f6a5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ object Denotations {
734734
this
735735
case _ =>
736736
if (coveredInterval.containsPhaseId(ctx.phaseId)) {
737-
if (ctx.debug) ctx.traceInvalid(this)
737+
if (ctx.debug || true) ctx.traceInvalid(this)
738738
staleSymbolError
739739
}
740740
else NoDenotation

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ trait SymDenotations { this: Context =>
7171

7272
/** Explain why symbol is invalid; used for debugging only */
7373
def traceInvalid(denot: Denotation): Boolean = {
74-
def show(d: Denotation) = s"$d#${d.symbol.id}"
74+
def show(d: Denotation) = s"$d#${d.symbol.id}/${denot.symbol.initialDenot.name.debugString}"
7575
def explain(msg: String) = {
7676
println(s"${show(denot)} is invalid at ${this.period} because $msg")
7777
false

compiler/src/dotty/tools/dotc/transform/LinkScala2Impls.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class LinkScala2Impls extends MiniPhase with IdentityDenotTransformer { thisTran
4646
// that's why it is runsAfterGroupOf
4747

4848
class Transform extends TreeTransform {
49-
def phase = LinkScala2Impls
49+
def phase = thisTransform
5050

5151
/** Copy definitions from implementation class to trait itself */
5252
private def augmentScala_2_12_Trait(mixin: ClassSymbol)(implicit ctx: Context): Unit = {
@@ -55,7 +55,7 @@ class LinkScala2Impls extends MiniPhase with IdentityDenotTransformer { thisTran
5555
name = if (sym.isConstructor) sym.name else ImplMethName(sym.name)
5656
)
5757
for (sym <- mixin.implClass.info.decls)
58-
newImpl(sym.asTerm).enteredAfter(LinkScala2Impls)
58+
newImpl(sym.asTerm).enteredAfter(thisTransform)
5959
}
6060

6161
override def prepareForTemplate(impl: Template)(implicit ctx: Context) = {
@@ -82,10 +82,10 @@ class LinkScala2Impls extends MiniPhase with IdentityDenotTransformer { thisTran
8282
}
8383

8484
private def implMethod(meth: Symbol)(implicit ctx: Context): Symbol = {
85-
val (implInfo, implName) =
86-
if (meth.owner.is(Scala_2_12_Trait))
85+
val (implInfo, implName) =
86+
if (meth.owner.is(Scala_2_12_Trait))
8787
(meth.owner.info, ImplMethName(meth.name.asTermName))
88-
else
88+
else
8989
(meth.owner.implClass.info, meth.name)
9090
if (meth.isConstructor)
9191
implInfo.decl(nme.TRAIT_CONSTRUCTOR).symbol

0 commit comments

Comments
 (0)