Make method an extension

Author: nicolasstucki

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

@@ -143,7 +143,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 (symHelper(classSym.linkedClass).isTopLevelModuleClass) /*exitingPickler*/ symHelper(classSym.linkedClass).memberClasses
+        if (classSym.linkedClass.isTopLevelModuleClass) /*exitingPickler*/ symHelper(classSym.linkedClass).memberClasses
         else Nil
       }
 
@@ -205,7 +205,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
             if (!str.isEmpty && str.last == '$') str.take(str.length - 1) else str
           // Java compatibility. See the big comment in BTypes that summarizes the InnerClass spec.
           val outerNameModule =
-            if (symHelper(innerClassSym.originalOwner.originalLexicallyEnclosingClass).isTopLevelModuleClass) dropModule(outerName)
+            if (innerClassSym.originalOwner.originalLexicallyEnclosingClass.isTopLevelModuleClass) dropModule(outerName)
             else outerName
           Some(outerNameModule.toString)
         }
@@ -256,7 +256,7 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
   final def javaFlags(sym: Symbol): Int = {
 
 
-    val privateFlag = sym.is(Flags.Private) || (sym.isPrimaryConstructor && symHelper(sym.owner).isTopLevelModuleClass)
+    val privateFlag = sym.is(Flags.Private) || (sym.isPrimaryConstructor && sym.owner.isTopLevelModuleClass)
 
     val finalFlag = sym.is(Flags.Final) &&  !toDenot(sym).isClassConstructor && !(sym.is(Flags.Mutable)) &&  !(sym.enclosingClass.is(Flags.Trait))
 

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

@@ -241,19 +241,22 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
         toDenot(sym)(shiftedContext).lexicallyEnclosingClass(shiftedContext)
       } else NoSymbol
 
+    /**
+     * True for module classes of package level objects. The backend will generate a mirror class for
+     * such objects.
+     */
+    def isTopLevelModuleClass: Boolean =
+      sym.is(Flags.ModuleClass) &&
+      ctx.atPhase(ctx.flattenPhase) {
+        toDenot(sym).owner.is(Flags.PackageClass)
+      }
+
   }
 
   def symHelper(sym: Symbol): SymbolHelper = new SymbolHelper(sym)
 
   class SymbolHelper(sym: Symbol) {
 
-    // tests
-
-
-    // navigation
-
-    // members
-
     /** For currently compiled classes: All locally defined classes including local classes.
      *  The empty list for classes that are not currently compiled.
 
@@ -272,15 +275,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
         }
       else Nil
 
-    /**
-     * True for module classes of package level objects. The backend will generate a mirror class for
-     * such objects.
-     */
-    def isTopLevelModuleClass: Boolean = sym.is(Flags.ModuleClass) &&
-      ctx.atPhase(ctx.flattenPhase) {
-        toDenot(sym).owner.is(Flags.PackageClass)
-      }
-
   }
 
   object SelectBI extends DeconstructorCommon[tpd.Tree] {

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

@@ -70,6 +70,7 @@ object GenBCode {
 }
 
 class GenBCodePipeline(val int: DottyBackendInterface)(implicit ctx: Context) extends BCodeSyncAndTry {
+  import int.symExtensions
 
   private var tree: Tree = _
 
@@ -203,7 +204,7 @@ class GenBCodePipeline(val int: DottyBackendInterface)(implicit ctx: Context) ex
 
       // -------------- mirror class, if needed --------------
       val mirrorC =
-        if (int.symHelper(claszSymbol).isTopLevelModuleClass) {
+        if (claszSymbol.isTopLevelModuleClass) {
           if (claszSymbol.companionClass == NoSymbol) {
             mirrorCodeGen.genMirrorClass(claszSymbol, cunit)
           } else {