Refactoring accessLocal

Author: EnzeXing

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

@@ -37,13 +37,13 @@ class Checker extends Phase {
 
   val traverser = new TreeTraverser {
     override def traverse(tree: Tree)(using Context): Unit =
+      traverseChildren(tree)
       tree match {
         case tdef: MemberDef =>
           // self-type annotation ValDef has no symbol
           if tdef.name != nme.WILDCARD then
             tdef.symbol.defTree = tree
         case _ =>
-          traverseChildren(tree)
       }
   }
 

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

@@ -406,7 +406,6 @@ class Semantic {
               given Trace = trace1
               val cls = target.owner.enclosingClass.asClass
               val ddef = target.defTree.asInstanceOf[DefDef]
-              // try early promotion here; if returns error, returns cold
               val env2 = Env(ddef, args.map(_.value).widenArgs)
               if target.isPrimaryConstructor then
                 given Env = env2
@@ -497,6 +496,29 @@ class Semantic {
           Result(value2, errors)
       }
     }
+
+    def accessLocal(sym: Symbol, default: Result, klass: ClassSymbol, source: Tree): Contextual[Result] =
+      sym.defTree match {
+        case vdef: ValDef =>
+          // resolve this for local variable
+          val enclosingClass = sym.owner.enclosingClass.asClass
+          val thisValue2 = resolveThis(enclosingClass, value, klass, source)
+          thisValue2 match {
+            case Hot => Result(Hot, Errors.empty)
+            
+            case Cold => 
+              val error = AccessCold(sym, source, trace.toVector)
+              Result(Hot, error :: Nil)
+            
+            case addr: Addr => 
+              val res = eval(vdef.rhs, addr, klass)
+              if res.value.promote("Try promote", source).isEmpty then Result(Hot, Errors.empty) else res
+                
+            case _ => ???
+          }
+
+        case _ => default
+      }
   end extension
 
 // ----- Promotion ----------------------------------------------------
@@ -903,26 +925,7 @@ class Semantic {
             // It's always safe to approximate them with `Cold`.
             Result(Cold, Nil)
         else
-          sym.defTree match {
-            case vdef: ValDef => {
-              // resolve this for local variable
-              val enclosingClass = sym.owner.enclosingClass.asClass
-              val thisValue2 = resolveThis(enclosingClass, thisV, klass, source)
-              thisValue2 match {
-                case Hot => Result(Hot, Errors.empty)
-                case Cold => {
-                  val error = AccessCold(sym, source, trace.toVector)
-                  Result(Hot, error :: Nil)
-                }
-                case addr: Addr => {
-                  val res = eval(vdef.rhs, addr, klass)
-                  if res.value.promote("Try promote", source).isEmpty then Result(Hot, Errors.empty) else res
-                }
-                case _ => ???
-              }
-            }
-            case _ => default()
-          }
+          thisV.accessLocal(sym, default(), klass, source)
 
       case tmref: TermRef =>
         cases(tmref.prefix, thisV, klass, source).select(tmref.symbol, source)