Set owner of context correctly

Author: liufengyun

compiler/src/dotty/tools/dotc/transform/init/Checker.scala

@@ -52,7 +52,7 @@ class Checker extends MiniPhase {
         thisClass = cls,
         fieldsInited = mutable.Set.empty,
         parentsInited = mutable.Set.empty,
-        env = baseEnv.withCtx(ctx)
+        env = baseEnv.withCtx(ctx.withOwner(cls))
       )
 
       Checking.checkClassBody(tree)

compiler/src/dotty/tools/dotc/transform/init/Checking.scala

@@ -146,7 +146,8 @@ object Checking {
   }
 
   private def check(eff: Effect)(implicit state: State): Errors =
-    if (state.visited.contains(eff)) Errors.empty else trace("checking effect " + eff.show, init, errs => Errors.show(errs.asInstanceOf[Errors])) {
+    if (state.visited.contains(eff)) Errors.empty
+    else trace("checking effect " + eff.show, init, errs => Errors.show(errs.asInstanceOf[Errors])) {
       implicit val state2: State = state.withVisited(eff)
 
       eff match {

compiler/src/dotty/tools/dotc/transform/init/Potentials.scala

@@ -88,6 +88,7 @@ object Potentials {
   }
 
   def resolveOuter(cur: ClassSymbol, outerPots: Potentials, cls: ClassSymbol)(implicit env: Env): Potentials =
+  trace("resolveOuter for " + cls.show + ", outer = " + show(outerPots) + ", cur = " + cur.show, init, s => Potentials.show(s.asInstanceOf[Potentials])) {
     if (cur == cls) outerPots
     else {
       val bottomClsSummary = env.summaryOf(cur)
@@ -98,6 +99,7 @@ object Potentials {
         case None => ??? // impossible
       }
     }
+  }
 
   /** The Outer potential for `classSymbol` of the object `pot`
    *

compiler/src/dotty/tools/dotc/transform/init/Summarization.scala

@@ -253,12 +253,13 @@ object Summarization {
 
   def resolveThis(cls: ClassSymbol, pot: Potential, cur: ClassSymbol, source: Tree)(implicit env: Env): Summary =
   trace("resolve " + cls.show + ", pot = " + pot.show + ", cur = " + cur.show, init, s => Summary.show(s.asInstanceOf[Summary])) {
+    val enclosing = cur.owner.lexicallyEnclosingClass.asClass
     if (cls.is(Flags.Package)) (Potentials.empty, Effects.empty)
-    else if (cls == cur) (pot.toPots, Effects.empty)
+    else if (cls == cur || enclosing.is(Flags.Package)) (pot.toPots, Effects.empty)
     else if (pot.size > 2) (Potentials.empty, Promote(pot)(source).toEffs)
     else {
       val pot2 = Outer(pot, cur)(pot.source)
-      resolveThis(cls, pot2, cur.lexicallyEnclosingClass.asClass, source)
+      resolveThis(cls, pot2, enclosing, source)
     }
   }
 

compiler/src/dotty/tools/dotc/transform/init/Summary.scala

@@ -32,6 +32,7 @@ object Summary {
     def summaryOf(member: Symbol)(implicit env: Env): Summary =
       if (summaryCache.contains(member)) summaryCache(member)
       else trace("summary for " + member.show, init, s => Summary.show(s.asInstanceOf[Summary])) {
+        implicit val env2 = env.withOwner(member)
         val summary =
           if (member.isConstructor)
             Summarization.analyzeConstructor(member)