Do not capture Context in symExtension

Author: nicolasstucki

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

@@ -11,7 +11,7 @@ import dotty.tools.dotc.core.Symbols._
  */
 final class BCodeAsmCommon[I <: DottyBackendInterface](val interface: I) {
   import interface._
-  import interface.symExtensions
+  import DottyBackendInterface.symExtensions
 
   /**
    * True if `classSym` is an anonymous class or a local class. I.e., false if `classSym` is a

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

@@ -30,7 +30,7 @@ trait BCodeBodyBuilder extends BCodeSkelBuilder {
   // import definitions._
   import tpd._
   import int._
-  import int.symExtensions
+  import DottyBackendInterface.symExtensions
   import bTypes._
   import coreBTypes._
   import BCodeBodyBuilder._

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

@@ -27,7 +27,7 @@ import dotty.tools.dotc.util.Spans._
  */
 trait BCodeSkelBuilder extends BCodeHelpers {
   import int._
-  import int.symExtensions
+  import DottyBackendInterface.symExtensions
   import tpd._
   import bTypes._
   import coreBTypes._

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

@@ -27,7 +27,7 @@ import dotty.tools.dotc.util.WeakHashSet
  */
 class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
   import int._
-  import int.symExtensions
+  import DottyBackendInterface.symExtensions
 
   lazy val TransientAttr = requiredClass[scala.transient]
   lazy val VolatileAttr = requiredClass[scala.volatile]

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

@@ -65,54 +65,8 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     if (found == null) None else Some(found)
   }
 
-  extension symExtensions on (sym: Symbol) {
-
-    def isInterface: Boolean = (sym.is(Flags.PureInterface)) || sym.is(Flags.Trait)
-
-    def isStaticConstructor: Boolean = (sym.isStaticMember && sym.isClassConstructor) || (sym.name eq nme.STATIC_CONSTRUCTOR)
-
-    def isStaticMember: Boolean = (sym ne NoSymbol) &&
-      (sym.is(Flags.JavaStatic) || sym.hasAnnotation(ctx.definitions.ScalaStaticAnnot))
-      // guard against no sumbol cause this code is executed to select which call type(static\dynamic) to use to call array.clone
-
-    /**
-     * True for module classes of modules that are top-level or owned only by objects. Module classes
-     * for such objects will get a MODULE$ flag and a corresponding static initializer.
-     */
-    def isStaticModuleClass: Boolean =
-      (sym.is(Flags.Module)) && {
-        // scalac uses atPickling here
-        // this would not work if modules are created after pickling
-        // for example by specialization
-        val original = toDenot(sym).initial
-        val validity = original.validFor
-        val shiftedContext = ctx.withPhase(validity.phaseId)
-        toDenot(sym)(shiftedContext).isStatic(shiftedContext)
-      }
-
 
 
-    def originalLexicallyEnclosingClass: Symbol =
-      // used to populate the EnclosingMethod attribute.
-      // it is very tricky in presence of classes(and annonymous classes) defined inside supper calls.
-      if (sym.exists) {
-        val validity = toDenot(sym).initial.validFor
-        val shiftedContext = ctx.withPhase(validity.phaseId)
-        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)
-      }
-
-  }
-
   object SelectBI extends DeconstructorCommon[tpd.Tree] {
 
     var desugared: tpd.Select = null
@@ -185,3 +139,54 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
   }
 
 }
+
+object DottyBackendInterface {
+
+  extension symExtensions on (sym: Symbol) {
+
+    def isInterface(using Context): Boolean = (sym.is(Flags.PureInterface)) || sym.is(Flags.Trait)
+
+    def isStaticConstructor(using Context): Boolean = (sym.isStaticMember && sym.isClassConstructor) || (sym.name eq nme.STATIC_CONSTRUCTOR)
+
+    def isStaticMember(using Context): Boolean = (sym ne NoSymbol) &&
+      (sym.is(Flags.JavaStatic) || sym.hasAnnotation(ctx.definitions.ScalaStaticAnnot))
+      // guard against no sumbol cause this code is executed to select which call type(static\dynamic) to use to call array.clone
+
+    /**
+     * True for module classes of modules that are top-level or owned only by objects. Module classes
+     * for such objects will get a MODULE$ flag and a corresponding static initializer.
+     */
+    def isStaticModuleClass(using Context): Boolean =
+      (sym.is(Flags.Module)) && {
+        // scalac uses atPickling here
+        // this would not work if modules are created after pickling
+        // for example by specialization
+        val original = toDenot(sym).initial
+        val validity = original.validFor
+        val shiftedContext = ctx.withPhase(validity.phaseId)
+        toDenot(sym)(shiftedContext).isStatic(shiftedContext)
+      }
+
+
+
+    def originalLexicallyEnclosingClass(using Context): Symbol =
+      // used to populate the EnclosingMethod attribute.
+      // it is very tricky in presence of classes(and annonymous classes) defined inside supper calls.
+      if (sym.exists) {
+        val validity = toDenot(sym).initial.validFor
+        val shiftedContext = ctx.withPhase(validity.phaseId)
+        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(using Context): Boolean =
+      sym.is(Flags.ModuleClass) &&
+      ctx.atPhase(ctx.flattenPhase) {
+        toDenot(sym).owner.is(Flags.PackageClass)
+      }
+
+  }
+}

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

@@ -70,7 +70,7 @@ object GenBCode {
 }
 
 class GenBCodePipeline(val int: DottyBackendInterface)(implicit ctx: Context) extends BCodeSyncAndTry {
-  import int.symExtensions
+  import DottyBackendInterface.symExtensions
 
   private var tree: Tree = _