Use effectiveScope when creating companionLinks

This was accidentally reverted from b641181.

Author: odersky

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

@@ -19,7 +19,6 @@ import util.Positions._
 import Names._
 import collection.mutable
 import ResolveSuper._
-import config.Config
 
 /** This phase adds super accessors and method overrides where
  *  linearization differs from Java's rule for default methods in interfaces.
@@ -96,7 +95,7 @@ object ResolveSuper {
   def rebindSuper(base: Symbol, acc: Symbol)(implicit ctx: Context): Symbol = {
     var bcs = base.info.baseClasses.dropWhile(acc.owner != _).tail
     var sym: Symbol = NoSymbol
-    val SuperAccessorName(memberName) = acc.name.unexpandedName // dotty deviation: ": Name" needed otherwise pattern type is neither a subtype nor a supertype of selector type
+    val SuperAccessorName(memberName) = acc.name.unexpandedName
     ctx.debuglog(i"starting rebindsuper from $base of ${acc.showLocated}: ${acc.info} in $bcs, name = $memberName")
     while (bcs.nonEmpty && sym == NoSymbol) {
       val other = bcs.head.info.nonPrivateDecl(memberName)

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

@@ -570,8 +570,8 @@ class Namer { typer: Typer =>
 
     /** Create links between companion object and companion class */
     def createLinks(classTree: TypeDef, moduleTree: TypeDef)(implicit ctx: Context) = {
-      val claz = ctx.denotNamed(classTree.name).symbol
-      val modl = ctx.denotNamed(moduleTree.name).symbol
+      val claz = ctx.effectiveScope.lookup(classTree.name)
+      val modl = ctx.effectiveScope.lookup(moduleTree.name)
       ctx.synthesizeCompanionMethod(nme.COMPANION_CLASS_METHOD, claz, modl).entered
       ctx.synthesizeCompanionMethod(nme.COMPANION_MODULE_METHOD, modl, claz).entered
     }