Fix rebase breakage

odersky · odersky · commit e4cb221c33f7 · 2020-03-02T08:53:50.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Namer.scala b/compiler/src/dotty/tools/dotc/typer/Namer.scala
@@ -1098,6 +1098,7 @@ class Namer { typer: Typer =>
                     (EmptyFlags, mbr.info.ensureMethodic)
                 var mbrFlags = Exported | Method | Final | maybeStable | sym.flags & RetainedExportFlags
                 if sym.isAllOf(ExtensionMethod) then mbrFlags |= Extension
+                val forwarderName = checkNoConflict(alias, isPrivate = false, span)
                 ctx.newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)
               }
             forwarder.info = avoidPrivateLeaks(forwarder)

Original file line number	Diff line number	Diff line change
`@@ -1098,6 +1098,7 @@ class Namer { typer: Typer =>`
`1098`	`1098`	`(EmptyFlags, mbr.info.ensureMethodic)`
`1099`	`1099`	`var mbrFlags = Exported \| Method \| Final \| maybeStable \| sym.flags & RetainedExportFlags`
`1100`	`1100`	`if sym.isAllOf(ExtensionMethod) then mbrFlags \|= Extension`
	`1101`	`+ val forwarderName = checkNoConflict(alias, isPrivate = false, span)`
`1101`	`1102`	`ctx.newSymbol(cls, forwarderName, mbrFlags, mbrInfo, coord = span)`
`1102`	`1103`	`}`
`1103`	`1104`	`forwarder.info = avoidPrivateLeaks(forwarder)`