Move methods

Author: nicolasstucki

compiler/src/dotty/tools/backend/jvm/BCodeHelpers.scala

@@ -434,6 +434,19 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
       annot.tree.tpe.typeSymbol.getAnnotation(AnnotationRetentionAttr).
         flatMap(_.argumentConstant(0).map(_.symbolValue)).getOrElse(AnnotationRetentionClassAttr)
 
+    private def assocsFromApply(tree: Tree): List[(Name, Tree)] = {
+      tree match {
+        case Block(_, expr) => assocsFromApply(expr)
+        case Apply(fun, args) =>
+          fun.tpe.widen match {
+            case MethodType(names) =>
+              (names zip args).filter {
+                case (_, t: tpd.Ident) if (t.tpe.normalizedPrefix eq NoPrefix) => false
+                case _ => true
+              }
+          }
+      }
+    }
   } // end of trait BCAnnotGen
 
   trait BCJGenSigGen {

compiler/src/dotty/tools/backend/jvm/BTypesFromSymbols.scala

@@ -7,6 +7,7 @@ import scala.annotation.threadUnsafe
 
 import dotty.tools.dotc.core.Flags
 import dotty.tools.dotc.core.Symbols._
+import dotty.tools.dotc.core.Phases.Phase
 import dotty.tools.dotc.transform.SymUtils._
 
 /**
@@ -125,7 +126,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
       // The lambdalift phase lifts all nested classes to the enclosing class, so if we collect
       // member classes right after lambdalift, we obtain all nested classes, including local and
       // anonymous ones.
-      val nestedClasses = symHelper(classSym).nestedClasses
+      val nestedClasses = getNestedClasses(classSym)
 
       // If this is a top-level class, and it has a companion object, the member classes of the
       // companion are added as members of the class. For example:
@@ -143,7 +144,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
       val companionModuleMembers = {
         // phase travel to exitingPickler: this makes sure that memberClassesOf only sees member classes,
         // not local classes of the companion module (E in the example) that were lifted by lambdalift.
-        if (classSym.linkedClass.isTopLevelModuleClass) /*exitingPickler*/ symHelper(classSym.linkedClass).memberClasses
+        if (classSym.linkedClass.isTopLevelModuleClass) /*exitingPickler*/ getMemberClasses(classSym.linkedClass)
         else Nil
       }
 
@@ -175,6 +176,22 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
     classBType
   }
 
+  /** For currently compiled classes: All locally defined classes including local classes.
+   *  The empty list for classes that are not currently compiled.
+   */
+  private def getNestedClasses(sym: Symbol): List[Symbol] = definedClasses(sym, ctx.flattenPhase)
+
+  /** For currently compiled classes: All classes that are declared as members of this class
+   *  (but not inherited ones). The empty list for classes that are not currently compiled.
+   */
+  private def getMemberClasses(sym: Symbol): List[Symbol] = definedClasses(sym, ctx.lambdaLiftPhase)
+
+  private def definedClasses(sym: Symbol, phase: Phase) =
+    if (sym.isDefinedInCurrentRun)
+      ctx.atPhase(phase) {
+        toDenot(sym).info.decls.filter(_.isClass)
+      }
+    else Nil
 
   private def buildNestedInfo(innerClassSym: Symbol): Option[NestedInfo] = {
     assert(innerClassSym.isClass, s"Cannot build NestedInfo for non-class symbol $innerClassSym")

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -192,21 +192,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
       None
     }
 
-
-  def assocsFromApply(tree: Tree): List[(Name, Tree)] = {
-    tree match {
-      case Block(_, expr) => assocsFromApply(expr)
-      case Apply(fun, args) =>
-        fun.tpe.widen match {
-          case MethodType(names) =>
-            (names zip args).filter {
-              case (_, t: tpd.Ident) if (t.tpe.normalizedPrefix eq NoPrefix) => false
-              case _ => true
-            }
-        }
-    }
-  }
-
   extension symExtensions on (sym: Symbol) {
 
     def isInterface: Boolean = (sym.is(Flags.PureInterface)) || sym.is(Flags.Trait)
@@ -255,30 +240,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
 
   }
 
-  def symHelper(sym: Symbol): SymbolHelper = new SymbolHelper(sym)
-
-  class SymbolHelper(sym: Symbol) {
-
-    /** For currently compiled classes: All locally defined classes including local classes.
-     *  The empty list for classes that are not currently compiled.
-
-     */
-    def nestedClasses: List[Symbol] = definedClasses(ctx.flattenPhase)
-
-    /** For currently compiled classes: All classes that are declared as members of this class
-     *  (but not inherited ones). The empty list for classes that are not currently compiled.
-     */
-    def memberClasses: List[Symbol] = definedClasses(ctx.lambdaLiftPhase)
-
-    private def definedClasses(phase: Phase) =
-      if (sym.isDefinedInCurrentRun)
-        ctx.atPhase(phase) {
-          toDenot(sym).info.decls.filter(_.isClass)
-        }
-      else Nil
-
-  }
-
   object SelectBI extends DeconstructorCommon[tpd.Tree] {
 
     var desugared: tpd.Select = null