Remove implicit definitions of ctx that are not parameters

Author: odersky

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

@@ -10,7 +10,7 @@ import dotty.tools.dotc.core.Symbols._
  * the compiler cake (Global).
  */
 final class BCodeAsmCommon[I <: DottyBackendInterface](val interface: I) {
-  import interface._
+  import interface.{_, given _}
   import DottyBackendInterface.symExtensions
 
   /**

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

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

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

@@ -45,7 +45,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
   import bTypes._
   import tpd._
   import coreBTypes._
-  import int._
+  import int.{_, given _}
   import DottyBackendInterface._
 
   def ScalaATTRName: String = "Scala"
@@ -360,7 +360,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
       val narg = normalizeArgument(arg)
       // Transformation phases are not run on annotation trees, so we need to run
       // `constToLiteral` at this point.
-      val t = constToLiteral(narg)(ctx.withPhase(ctx.erasurePhase))
+      val t = constToLiteral(narg)(using ctx.withPhase(ctx.erasurePhase))
       t match {
         case Literal(const @ Constant(_)) =>
           const.tag match {
@@ -464,7 +464,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
   } // end of trait BCAnnotGen
 
   trait BCJGenSigGen {
-    import int._
+    import int.{_, given _}
 
     def getCurrentCUnit(): CompilationUnit
 

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

@@ -19,7 +19,7 @@ trait BCodeIdiomatic {
   val int: DottyBackendInterface
   final lazy val bTypes = new BTypesFromSymbols[int.type](int)
 
-  import int._
+  import int.{_, given _}
   import bTypes._
   import coreBTypes._
 

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

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

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

@@ -18,7 +18,7 @@ import dotty.tools.dotc.ast.tpd.TreeOps
  *
  */
 trait BCodeSyncAndTry extends BCodeBodyBuilder {
-  import int._
+  import int.{_, given _}
   import tpd._
   import bTypes._
   import coreBTypes._

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

@@ -15,7 +15,7 @@ import scala.tools.asm
 abstract class BTypes {
 
   val int: DottyBackendInterface
-  import int._
+  import int.{_, given _}
   /**
    * A map from internal names to ClassBTypes. Every ClassBType is added to this map on its
    * construction.

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

@@ -27,7 +27,7 @@ import dotty.tools.dotc.util.WeakHashSet
  * not have access to the compiler instance.
  */
 class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
-  import int._
+  import int.{_, given _}
   import DottyBackendInterface.{symExtensions, _}
 
   lazy val TransientAttr = requiredClass[scala.transient]

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

@@ -16,7 +16,7 @@ class FileConflictException(msg: String, val file: AbstractFile) extends IOExcep
  */
 trait BytecodeWriters {
   val int: DottyBackendInterface
-  import int._
+  import int.{_, given _}
 
   /**
    * @param clsName cls.getName

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

@@ -33,7 +33,7 @@ import dotty.tools.dotc.transform.Erasure
  */
 class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: DottyBackendInterface]](val bTypes: BTFS) {
   import bTypes._
-  import int._
+  import int.{_, given _}
   import DottyBackendInterface._
 
   //import global._

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

@@ -34,7 +34,7 @@ import Names.TermName
 import Annotations.Annotation
 import Names.Name
 
-class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: Map[Symbol, Set[ClassSymbol]])(implicit val ctx: Context) {
+class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap: Map[Symbol, Set[ClassSymbol]])(using val ctx: Context) {
 
   private val desugared = new java.util.IdentityHashMap[Type, tpd.Select]
 
@@ -107,10 +107,10 @@ object DottyBackendInterface {
     else clazz.getName
   }
 
-  def requiredClass[T](implicit evidence: ClassTag[T], ctx: Context): Symbol =
+  def requiredClass[T](using evidence: ClassTag[T], ctx: Context): Symbol =
     ctx.requiredClass(erasureString(evidence.runtimeClass))
 
-  def requiredModule[T](implicit evidence: ClassTag[T], ctx: Context): Symbol = {
+  def requiredModule[T](using evidence: ClassTag[T], ctx: Context): Symbol = {
     val moduleName = erasureString(evidence.runtimeClass)
     val className = if (moduleName.endsWith("$")) moduleName.dropRight(1)  else moduleName
     ctx.requiredModule(className)

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

@@ -48,7 +48,7 @@ class GenBCode extends Phase {
 
   def run(implicit ctx: Context): Unit = {
     new GenBCodePipeline(new DottyBackendInterface(
-      outputDir, superCallsMap.toMap)(ctx))(ctx).run(ctx.compilationUnit.tpdTree)
+      outputDir, superCallsMap.toMap)(using ctx))(using ctx).run(ctx.compilationUnit.tpdTree)
   }
 
   override def runOn(units: List[CompilationUnit])(implicit ctx: Context): List[CompilationUnit] = {
@@ -69,7 +69,7 @@ object GenBCode {
   val name: String = "genBCode"
 }
 
-class GenBCodePipeline(val int: DottyBackendInterface)(implicit ctx: Context) extends BCodeSyncAndTry {
+class GenBCodePipeline(val int: DottyBackendInterface)(using ctx: Context) extends BCodeSyncAndTry {
   import DottyBackendInterface.symExtensions
 
   private var tree: Tree = _

compiler/src/dotty/tools/dotc/Driver.scala

@@ -155,12 +155,12 @@ class Driver {
    */
   final def process(args: Array[String], reporter: Reporter = null,
     callback: interfaces.CompilerCallback = null): Reporter = {
-    val ctx = initCtx.fresh
+    val compileCtx = initCtx.fresh
     if (reporter != null)
-      ctx.setReporter(reporter)
+      compileCtx.setReporter(reporter)
     if (callback != null)
-      ctx.setCompilerCallback(callback)
-    process(args, ctx)
+      compileCtx.setCompilerCallback(callback)
+    process(args, compileCtx)
   }
 
   /** Entry point to the compiler with no optional arguments.
@@ -190,8 +190,8 @@ class Driver {
    *                    if compilation succeeded.
    */
   def process(args: Array[String], rootCtx: Context): Reporter = {
-    val (fileNames, ctx) = setup(args, rootCtx)
-    doCompile(newCompiler(ctx), fileNames)(ctx)
+    val (fileNames, compileCtx) = setup(args, rootCtx)
+    doCompile(newCompiler(compileCtx), fileNames)(compileCtx)
   }
 
   def main(args: Array[String]): Unit = {

compiler/src/dotty/tools/dotc/ast/PluggableTransformers.scala

@@ -847,7 +847,7 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
         traverser.traverse(tree)
         tree
       }
-      else changeOwnerAfter(from, to, trans)(ctx.withPhase(trans.next))
+      else changeOwnerAfter(from, to, trans)(using ctx.withPhase(trans.next))
 
     /** A select node with the given selector name and a computed type */
     def select(name: Name)(implicit ctx: Context): Select =

compiler/src/dotty/tools/dotc/ast/tpd.scala

@@ -3,7 +3,7 @@ package dotc
 package core
 
 import SymDenotations.{ SymDenotation, ClassDenotation, NoDenotation, LazyType }
-import Contexts.{Context, Ctx, ctx, ContextBase}
+import Contexts.{Context, ctx, ContextBase}
 import Names._
 import NameKinds._
 import StdNames._
@@ -797,7 +797,7 @@ object Denotations {
               val transformer = ctx.base.denotTransformers(nextTransformerId)
               //println(s"transforming $this with $transformer")
               try
-                next = transformer.transform(cur)(ctx.withPhase(transformer))
+                next = transformer.transform(cur)(using ctx.withPhase(transformer))
               catch {
                 case ex: CyclicReference =>
                   println(s"error while transforming $this") // DEBUG

compiler/src/dotty/tools/dotc/core/Denotations.scala

@@ -4919,7 +4919,8 @@ object Types {
     def mapOver(tp: Type): Type = {
       record(s"mapOver ${getClass}")
       record("mapOver total")
-      implicit val ctx = this.mapCtx
+      val ctx = this.mapCtx // optimization for performance
+      given Context = ctx
       tp match {
         case tp: NamedType =>
           if stopBecauseStaticOrLocal(tp) then tp

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -939,7 +939,7 @@ class ClassfileParser(
       val outerName = entry.outerName.stripModuleClassSuffix
       val innerName = entry.originalName
       val owner = classNameToSymbol(outerName)
-      val result = getMember(owner, innerName.toTypeName)(ctx.withPhase(ctx.typerPhase))
+      val result = getMember(owner, innerName.toTypeName)(using ctx.withPhase(ctx.typerPhase))
       assert(result ne NoSymbol,
         i"""failure to resolve inner class:
            |externalName = ${entry.externalName},

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -29,16 +29,16 @@ class IDEDecompilerDriver(val settings: List[String]) extends dotc.Driver {
 
     val run = decompiler.newRun(myInitCtx.fresh.setReporter(reporter))
 
-    implicit val ctx = run.runContext
+    inContext(run.runContext) {
+      run.compile(List(className))
+      run.printSummary()
+      val unit = ctx.run.units.head
 
-    run.compile(List(className))
-    run.printSummary()
-    val unit = ctx.run.units.head
+      val decompiled = ReflectionImpl.showTree(unit.tpdTree)
+      val tree = new TastyHTMLPrinter(unit.pickled.head._2).printContents()
 
-    val decompiled = ReflectionImpl.showTree(unit.tpdTree)
-    val tree = new TastyHTMLPrinter(unit.pickled.head._2).printContents()
-
-    reporter.removeBufferedMessages.foreach(message => System.err.println(message))
-    (tree, decompiled)
+      reporter.removeBufferedMessages.foreach(message => System.err.println(message))
+      (tree, decompiled)
+    }
   }
 }

compiler/src/dotty/tools/dotc/decompiler/IDEDecompilerDriver.scala

@@ -76,7 +76,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =
 
   override def prepareForUnit(tree: Tree)(implicit ctx: Context): Context = {
     val captured = (new CollectCaptured)
-      .runOver(ctx.compilationUnit.tpdTree)(ctx.withPhase(thisPhase))
+      .runOver(ctx.compilationUnit.tpdTree)(using ctx.withPhase(thisPhase))
     ctx.fresh.updateStore(Captured, captured)
   }
 
@@ -91,7 +91,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase =
   }
 
   override def prepareForValDef(vdef: ValDef)(implicit ctx: Context): Context = {
-    val sym = vdef.symbol(ctx.withPhase(thisPhase))
+    val sym = vdef.symbol(using ctx.withPhase(thisPhase))
     if (captured contains sym) {
       val newd = sym.denot(using ctx.withPhase(thisPhase)).copySymDenotation(
         info = refClass(sym.info.classSymbol, sym.hasAnnotation(defn.VolatileAnnot)).typeRef,

compiler/src/dotty/tools/dotc/transform/CapturedVars.scala

@@ -78,7 +78,7 @@ class ElimErasedValueType extends MiniPhase with InfoTransformer { thisPhase =>
    *  this phase, yet do not have matching types before erasure.
    */
   private def checkNoClashes(root: Symbol)(implicit ctx: Context) = {
-    val opc = new OverridingPairs.Cursor(root)(ctx.withPhase(thisPhase)) {
+    val opc = new OverridingPairs.Cursor(root)(using ctx.withPhase(thisPhase)) {
       override def exclude(sym: Symbol) =
         !sym.is(Method) || sym.is(Bridge) || super.exclude(sym)
       override def matches(sym1: Symbol, sym2: Symbol) =

compiler/src/dotty/tools/dotc/transform/ElimErasedValueType.scala

@@ -347,7 +347,7 @@ object ExplicitOuter {
    */
   class OuterOps(val ictx: Context) extends AnyVal {
     /** The context of all operations of this class */
-    private implicit def ctx: Context = ictx
+    given Context = ictx
 
     /** If `cls` has an outer parameter add one to the method type `tp`. */
     def addParam(cls: ClassSymbol, tp: Type): Type =

compiler/src/dotty/tools/dotc/transform/ExplicitOuter.scala

@@ -129,7 +129,7 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
   }
 
   override def transformStats(trees: List[Tree])(implicit ctx: Context): List[Tree] =
-    ast.Trees.flatten(reorderAndComplete(trees)(ctx.withPhase(thisPhase.next)))
+    ast.Trees.flatten(reorderAndComplete(trees)(using ctx.withPhase(thisPhase.next)))
 
   private object collectBinders extends TreeAccumulator[List[Ident]] {
     def apply(annots: List[Ident], t: Tree)(implicit ctx: Context): List[Ident] = t match {