Resolve overriding early

Author: liufengyun

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

@@ -231,7 +231,8 @@ object Checking {
         val cls = pot match
           case hot: Hot => hot.classSymbol
           case obj: Global => obj.moduleClass
-        state.dependencies += StaticCall(cls, sym)(pot.source)
+        val target = resolve(cls, sym)
+        state.dependencies += StaticCall(cls, target)(pot.source)
         Errors.empty
 
       case _: Cold =>
@@ -330,19 +331,23 @@ object Checking {
           Errors.empty
 
         case MethodReturn(hot: Hot, sym) =>
-          state.dependencies += ProxyUsage(hot.classSymbol, sym)(pot.source)
+          val target = resolve(hot.classSymbol, sym)
+          state.dependencies += ProxyUsage(hot.classSymbol, target)(pot.source)
           Errors.empty
 
         case MethodReturn(obj: Global, sym) =>
-          state.dependencies += ProxyUsage(obj.moduleClass, sym)(pot.source)
+          val target = resolve(obj.moduleClass, sym)
+          state.dependencies += ProxyUsage(obj.moduleClass, target)(pot.source)
           Errors.empty
 
         case FieldReturn(hot: Hot, sym) =>
-          state.dependencies += ProxyUsage(hot.classSymbol, sym)(pot.source)
+          val target = resolve(hot.classSymbol, sym)
+          state.dependencies += ProxyUsage(hot.classSymbol, target)(pot.source)
           Errors.empty
 
         case FieldReturn(obj: Global, sym) =>
-          state.dependencies += ProxyUsage(obj.moduleClass, sym)(pot.source)
+          val target = resolve(obj.moduleClass, sym)
+          state.dependencies += ProxyUsage(obj.moduleClass, target)(pot.source)
           Errors.empty
 
         case Fun(pots, effs) =>

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

@@ -65,12 +65,18 @@ case class InstanceUsage(symbol: Symbol)(val source: Tree) extends Dependency {
  *
  *  The method can be either on a static object or on a hot object.
  *  The target of the call is determined statically.
+ *
+ *  Note: Virtual method resolution should have been performed for the target.
+ *
  */
 case class StaticCall(cls: ClassSymbol, symbol: Symbol)(val source: Tree) extends Dependency {
   def show(using Context): String = "StaticCall(" + cls.show + ", " + symbol.show + ")"
 }
 
-/** A static method call result is used */
+/** A static method call result is used
+ *
+ *  Note: Virtual method resolution should have been performed for the target.
+ */
  case class ProxyUsage(cls: ClassSymbol, symbol: Symbol)(val source: Tree) extends Dependency {
   def show(using Context): String = "ProxyUsage(" + cls.show + ", " + symbol.show + ")"
 }
@@ -166,17 +172,17 @@ class CycleChecker(cache: Cache) {
     }
 
   private def checkStaticCall(dep: StaticCall)(using Context, State): List[Error] =
-    if !classesInCurrentRun.contains(dep.cls) then
-      Util.traceIndented("skip " + dep.cls.show + " which is not in current run ", init)
+    if !classesInCurrentRun.contains(dep.cls) || !classesInCurrentRun.contains(dep.symbol.owner)  then
+      Util.traceIndented("skip " + dep.show + " which is not in current run ", init)
       Nil
     else {
       val deps = methodDependencies(dep)
       deps.flatMap(check(_))
     }
 
   private def checkProxyUsage(dep: ProxyUsage)(using Context, State): List[Error] =
-    if !classesInCurrentRun.contains(dep.cls) then
-      Util.traceIndented("skip " + dep.cls.show + " which is not in current run ", init)
+    if !classesInCurrentRun.contains(dep.cls) || !classesInCurrentRun.contains(dep.symbol.owner) then
+      Util.traceIndented("skip " + dep.show + " which is not in current run ", init)
       Nil
     else {
       val deps = proxyDependencies(dep)
@@ -239,8 +245,7 @@ class CycleChecker(cache: Cache) {
       }
 
       val pot = Hot(dep.cls)(dep.source)
-      val target = Util.resolve(dep.cls, dep.symbol)
-      val effs = pot.potentialsOf(target)(using env).promote(dep.source)
+      val effs = pot.potentialsOf(dep.symbol)(using env).promote(dep.source)
 
       val errs = effs.flatMap(Checking.check(_)(using state))
       assert(errs.isEmpty, "unexpected errors: " + Errors.show(errs.toList))
@@ -355,8 +360,7 @@ class CycleChecker(cache: Cache) {
     }
 
     val pot = Hot(dep.cls)(dep.source)
-    val target = Util.resolve(dep.cls, dep.symbol)
-    val effs = pot.effectsOf(target)(using env)
+    val effs = pot.effectsOf(dep.symbol)(using env)
 
     val errs = effs.flatMap(Checking.check(_)(using state))
     assert(errs.isEmpty, "unexpected errors: " + Errors.show(errs.toList))