Add explicit Context

Author: nicolasstucki

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

@@ -44,6 +44,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
   import tpd._
   import coreBTypes._
   import int._
+  import DottyBackendInterface._
 
   def ScalaATTRName: String = "Scala"
   def ScalaSignatureATTRName: String = "ScalaSig"

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 DottyBackendInterface.symExtensions
+  import DottyBackendInterface.{symExtensions, _}
   import tpd._
   import bTypes._
   import coreBTypes._

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

@@ -610,7 +610,7 @@ abstract class BTypes {
       assert(!ClassBType.isInternalPhantomType(internalName), s"Cannot create ClassBType for phantom type $this")
 
       assert(
-        if (info.superClass.isEmpty) { isJLO(this) || (int.isCompilingPrimitive && ClassBType.hasNoSuper(internalName)) }
+        if (info.superClass.isEmpty) { isJLO(this) || (DottyBackendInterface.isCompilingPrimitive && ClassBType.hasNoSuper(internalName)) }
         else if (isInterface) isJLO(info.superClass.get)
         else !isJLO(this) && ifInit(info.superClass.get)(!_.isInterface),
         s"Invalid superClass in $this: ${info.superClass}"

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 DottyBackendInterface.symExtensions
+  import DottyBackendInterface.{symExtensions, _}
 
   lazy val TransientAttr = requiredClass[scala.transient]
   lazy val VolatileAttr = requiredClass[scala.volatile]

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

@@ -34,6 +34,7 @@ import dotty.tools.dotc.transform.Erasure
 class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) {
   import bTypes._
   import int._
+  import DottyBackendInterface._
 
   //import global._
   //import rootMirror.{requiredClass, getClassIfDefined}

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

@@ -36,20 +36,6 @@ import Names.Name
 
 class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: Map[Symbol, Set[ClassSymbol]])(implicit val ctx: Context) {
 
-  private def erasureString(clazz: Class[_]): String = {
-    if (clazz.isArray) "Array[" + erasureString(clazz.getComponentType) + "]"
-    else clazz.getName
-  }
-
-  def requiredClass[T](implicit evidence: ClassTag[T]): Symbol =
-    ctx.requiredClass(erasureString(evidence.runtimeClass))
-
-  def requiredModule[T](implicit evidence: ClassTag[T]): Symbol = {
-    val moduleName = erasureString(evidence.runtimeClass)
-    val className = if (moduleName.endsWith("$")) moduleName.dropRight(1)  else moduleName
-    ctx.requiredModule(className)
-  }
-
   private val desugared = new java.util.IdentityHashMap[Type, tpd.Select]
 
   def desugarIdentBI(i: Ident): Option[tpd.Select] = {
@@ -103,8 +89,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     def _2: List[Tree] = field.elems
   }
 
-
-
   abstract class DeconstructorCommon[T >: Null <: AnyRef] {
     var field: T = null
     def get: this.type = this
@@ -116,31 +100,23 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
     }
   }
 
+}
 
+object DottyBackendInterface {
 
-  private val primitiveCompilationUnits = Set(
-    "Unit.scala",
-    "Boolean.scala",
-    "Char.scala",
-    "Byte.scala",
-    "Short.scala",
-    "Int.scala",
-    "Float.scala",
-    "Long.scala",
-    "Double.scala"
-  )
-
-  /**
-   * True if the current compilation unit is of a primitive class (scala.Boolean et al).
-   * Used only in assertions.
-   */
-  def isCompilingPrimitive = {
-    primitiveCompilationUnits(ctx.compilationUnit.source.file.name)
+  private def erasureString(clazz: Class[_]): String = {
+    if (clazz.isArray) "Array[" + erasureString(clazz.getComponentType) + "]"
+    else clazz.getName
   }
 
-}
+  def requiredClass[T](implicit evidence: ClassTag[T], ctx: Context): Symbol =
+    ctx.requiredClass(erasureString(evidence.runtimeClass))
 
-object DottyBackendInterface {
+  def requiredModule[T](implicit evidence: ClassTag[T], ctx: Context): Symbol = {
+    val moduleName = erasureString(evidence.runtimeClass)
+    val className = if (moduleName.endsWith("$")) moduleName.dropRight(1)  else moduleName
+    ctx.requiredModule(className)
+  }
 
   extension symExtensions on (sym: Symbol) {
 
@@ -189,4 +165,25 @@ object DottyBackendInterface {
       }
 
   }
+
+  private val primitiveCompilationUnits = Set(
+    "Unit.scala",
+    "Boolean.scala",
+    "Char.scala",
+    "Byte.scala",
+    "Short.scala",
+    "Int.scala",
+    "Float.scala",
+    "Long.scala",
+    "Double.scala"
+  )
+
+  /**
+   * True if the current compilation unit is of a primitive class (scala.Boolean et al).
+   * Used only in assertions.
+   */
+  def isCompilingPrimitive(using ctx: Context) = {
+    primitiveCompilationUnits(ctx.compilationUnit.source.file.name)
+  }
+
 }