Remove Context to ContextBase implicit conversion

Author: OlivierBlanvillain

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

@@ -43,7 +43,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
    */
   protected[this] def rootContext(implicit ctx: Context): Context = {
     ctx.initialize()(ctx)
-    ctx.setPhasePlan(comp.phases)
+    ctx.base.setPhasePlan(comp.phases)
     val rootScope = new MutableScope
     val bootstrap = ctx.fresh
       .setPeriod(Period(comp.nextRunId, FirstPhaseId))
@@ -148,7 +148,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
 
   protected def compileUnits()(implicit ctx: Context) = Stats.maybeMonitored {
     if (!ctx.mode.is(Mode.Interactive)) // IDEs might have multi-threaded access, accesses are synchronized
-      ctx.checkSingleThreaded()
+      ctx.base.checkSingleThreaded()
 
     compiling = true
 
@@ -157,16 +157,16 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       if (ctx.settings.YtestPickler.value) List("pickler")
       else ctx.settings.YstopAfter.value
 
-    val pluginPlan = ctx.addPluginPhases(ctx.phasePlan)
-    val phases = ctx.squashPhases(pluginPlan,
+    val pluginPlan = ctx.addPluginPhases(ctx.base.phasePlan)
+    val phases = ctx.base.squashPhases(pluginPlan,
       ctx.settings.Yskip.value, ctx.settings.YstopBefore.value, stopAfter, ctx.settings.Ycheck.value)
-    ctx.usePhases(phases)
+    ctx.base.usePhases(phases)
 
     def runPhases(implicit ctx: Context) = {
       var lastPrintedTree: PrintedTree = NoPrintedTree
       val profiler = ctx.profiler
 
-      for (phase <- ctx.allPhases)
+      for (phase <- ctx.base.allPhases)
         if (phase.isRunnable)
           Stats.trackTime(s"$phase ms ") {
             val start = System.currentTimeMillis
@@ -225,7 +225,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
   private def printTree(last: PrintedTree)(implicit ctx: Context): PrintedTree = {
     val unit = ctx.compilationUnit
     val prevPhase = ctx.phase.prev // can be a mini-phase
-    val squashedPhase = ctx.squashed(prevPhase)
+    val squashedPhase = ctx.base.squashed(prevPhase)
     val treeString = unit.tpdTree.show(ctx.withProperty(XprintMode, Some(())))
 
     ctx.echo(s"result of $unit after $squashedPhase:")
@@ -271,4 +271,4 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
     myUnits = null
     myUnitsCached = null
   }
-}
+}

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

@@ -426,6 +426,32 @@ object Contexts {
       "Context(\n" +
       (outersIterator map ( ctx => s"  owner = ${ctx.owner}, scope = ${ctx.scope}, import = ${iinfo(ctx)}") mkString "\n")
     }
+
+    def typerPhase                  = base.typerPhase
+    def sbtExtractDependenciesPhase = base.sbtExtractDependenciesPhase
+    def picklerPhase                = base.picklerPhase
+    def refchecksPhase              = base.refchecksPhase
+    def patmatPhase                 = base.patmatPhase
+    def elimRepeatedPhase           = base.elimRepeatedPhase
+    def extensionMethodsPhase       = base.extensionMethodsPhase
+    def explicitOuterPhase          = base.explicitOuterPhase
+    def gettersPhase                = base.gettersPhase
+    def erasurePhase                = base.erasurePhase
+    def elimErasedValueTypePhase    = base.elimErasedValueTypePhase
+    def lambdaLiftPhase             = base.lambdaLiftPhase
+    def flattenPhase                = base.flattenPhase
+    def genBCodePhase               = base.genBCodePhase
+    def phases                      = base.phases
+
+    def settings                    = base.settings
+    def definitions                 = base.definitions
+    def platform                    = base.platform
+    def pendingUnderlying           = base.pendingUnderlying
+    def uniqueNamedTypes            = base.uniqueNamedTypes
+    def uniques                     = base.uniques
+    def nextId                      = base.nextId
+
+    def initialize()(implicit ctx: Context) = base.initialize()(ctx)
   }
 
   /** A condensed context provides only a small memory footprint over
@@ -518,7 +544,7 @@ object Contexts {
   /** A class defining the initial context with given context base
    *  and set of possible settings.
    */
-  private class InitialContext(val base: ContextBase, settings: SettingGroup) extends FreshContext {
+  private class InitialContext(val base: ContextBase, settingsGroup: SettingGroup) extends FreshContext {
     outer = NoContext
     period = InitialPeriod
     mode = Mode.None
@@ -527,7 +553,7 @@ object Contexts {
     tree = untpd.EmptyTree
     typeAssigner = TypeAssigner
     moreProperties = Map.empty
-    store = initialStore.updated(settingsStateLoc, settings.defaultState)
+    store = initialStore.updated(settingsStateLoc, settingsGroup.defaultState)
     typeComparer = new TypeComparer(this)
     searchHistory = new SearchHistory(0, Map())
     gadt = EmptyGADTMap
@@ -682,14 +708,6 @@ object Contexts {
       else assert(thread == Thread.currentThread(), "illegal multithreaded access to ContextBase")
   }
 
-  object Context {
-
-    /** implicit conversion that injects all ContextBase members into a context */
-    implicit def toBase(ctx: Context): ContextBase = ctx.base
-
-    // @sharable val theBase = new ContextBase // !!! DEBUG, so that we can use a minimal context for reporting even in code that normally cannot access a context
-  }
-
   class GADTMap(initBounds: SimpleIdentityMap[Symbol, TypeBounds]) extends util.DotClass {
     private[this] var myBounds = initBounds
     def setBounds(sym: Symbol, b: TypeBounds): Unit =

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

@@ -189,12 +189,12 @@ class Definitions {
   }
 
   lazy val RootClass: ClassSymbol = ctx.newPackageSymbol(
-    NoSymbol, nme.ROOT, (root, rootcls) => ctx.rootLoader(root)).moduleClass.asClass
+    NoSymbol, nme.ROOT, (root, rootcls) => ctx.base.rootLoader(root)).moduleClass.asClass
   lazy val RootPackage: TermSymbol = ctx.newSymbol(
     NoSymbol, nme.ROOTPKG, PackageCreationFlags, TypeRef(NoPrefix, RootClass))
 
   lazy val EmptyPackageVal = ctx.newPackageSymbol(
-    RootClass, nme.EMPTY_PACKAGE, (emptypkg, emptycls) => ctx.rootLoader(emptypkg)).entered
+    RootClass, nme.EMPTY_PACKAGE, (emptypkg, emptycls) => ctx.base.rootLoader(emptypkg)).entered
   lazy val EmptyPackageClass = EmptyPackageVal.moduleClass.asClass
 
   /** A package in which we can place all methods that are interpreted specially by the compiler */

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

@@ -22,7 +22,7 @@ object DenotTransformers {
   trait DenotTransformer extends Phase {
 
     /** The last phase during which the transformed denotations are valid */
-    def lastPhaseId(implicit ctx: Context) = ctx.nextDenotTransformerId(id + 1)
+    def lastPhaseId(implicit ctx: Context) = ctx.base.nextDenotTransformerId(id + 1)
 
     /** The validity period of the transformed denotations in the given context */
     def validFor(implicit ctx: Context): Period =

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

@@ -896,12 +896,12 @@ object Denotations {
           } else {
             //println(s"might need new denot for $cur, valid for ${cur.validFor} at $currentPeriod")
             // not found, cur points to highest existing variant
-            val nextTransformerId = ctx.nextDenotTransformerId(cur.validFor.lastPhaseId)
+            val nextTransformerId = ctx.base.nextDenotTransformerId(cur.validFor.lastPhaseId)
             if (currentPeriod.lastPhaseId <= nextTransformerId)
               cur.validFor = Period(currentPeriod.runId, cur.validFor.firstPhaseId, nextTransformerId)
             else {
               var startPid = nextTransformerId + 1
-              val transformer = ctx.denotTransformers(nextTransformerId)
+              val transformer = ctx.base.denotTransformers(nextTransformerId)
               //println(s"transforming $this with $transformer")
               try {
                 next = transformer.transform(cur)(ctx.withPhase(transformer))

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

@@ -619,14 +619,14 @@ object Types {
           val jointInfo =
             if (rinfo.isAlias) rinfo
             else if (pinfo.isAlias) pinfo
-            else if (ctx.pendingMemberSearches.contains(name)) pinfo safe_& rinfo
+            else if (ctx.base.pendingMemberSearches.contains(name)) pinfo safe_& rinfo
             else pinfo recoverable_& rinfo
           pdenot.asSingleDenotation.derivedSingleDenotation(pdenot.symbol, jointInfo)
         } else {
           pdenot & (
             new JointRefDenotation(NoSymbol, rinfo, Period.allInRun(ctx.runId)),
             pre,
-            safeIntersection = ctx.pendingMemberSearches.contains(name))
+            safeIntersection = ctx.base.pendingMemberSearches.contains(name))
         }
       }
 
@@ -668,13 +668,13 @@ object Types {
       }
 
       def goAnd(l: Type, r: Type) = {
-        go(l) & (go(r), pre, safeIntersection = ctx.pendingMemberSearches.contains(name))
+        go(l) & (go(r), pre, safeIntersection = ctx.base.pendingMemberSearches.contains(name))
       }
 
-      val recCount = ctx.findMemberCount
+      val recCount = ctx.base.findMemberCount
       if (recCount >= Config.LogPendingFindMemberThreshold)
-        ctx.pendingMemberSearches = name :: ctx.pendingMemberSearches
-      ctx.findMemberCount = recCount + 1
+        ctx.base.pendingMemberSearches = name :: ctx.base.pendingMemberSearches
+      ctx.base.findMemberCount = recCount + 1
       try go(this)
       catch {
         case ex: Throwable =>
@@ -691,8 +691,8 @@ object Types {
       }
       finally {
         if (recCount >= Config.LogPendingFindMemberThreshold)
-          ctx.pendingMemberSearches = ctx.pendingMemberSearches.tail
-        ctx.findMemberCount = recCount
+          ctx.base.pendingMemberSearches = ctx.base.pendingMemberSearches.tail
+        ctx.base.findMemberCount = recCount
       }
     }
 
@@ -1928,8 +1928,8 @@ object Types {
      *  not loop before the error is detected.
      */
     final def controlled[T](op: => T)(implicit ctx: Context): T = try {
-      ctx.underlyingRecursions += 1
-      if (ctx.underlyingRecursions < Config.LogPendingUnderlyingThreshold)
+      ctx.base.underlyingRecursions += 1
+      if (ctx.base.underlyingRecursions < Config.LogPendingUnderlyingThreshold)
         op
       else if (ctx.pendingUnderlying contains this)
         throw CyclicReference(symbol)
@@ -1941,7 +1941,7 @@ object Types {
           ctx.pendingUnderlying -= this
         }
     } finally {
-      ctx.underlyingRecursions -= 1
+      ctx.base.underlyingRecursions -= 1
     }
 
     /** The argument corresponding to class type parameter `tparam` as seen from
@@ -3786,7 +3786,7 @@ object Types {
     def apply(msg: => Message)(implicit ctx: Context): ErrorType = {
       val et = new ErrorType {
         def msg(implicit ctx: Context): Message =
-          ctx.errorTypeMsg.get(this) match {
+          ctx.base.errorTypeMsg.get(this) match {
             case Some(msgFun) => msgFun()
             case None => "error message from previous run no longer available"
           }

compiler/src/dotty/tools/dotc/fromtasty/ReadTastyTreesFromClasses.scala

@@ -60,7 +60,7 @@ class ReadTastyTreesFromClasses extends FrontEnd {
       // Note that if both the class and the object are present, then loading the class will also load
       // the object, this is why we use orElse here, otherwise we could load the object twice and
       // create ambiguities!
-      ctx.staticRef(className) match {
+      ctx.base.staticRef(className) match {
         case clsd: ClassDenotation =>
           clsd.infoOrCompleter match {
             case info: ClassfileLoader =>

compiler/src/dotty/tools/dotc/plugins/Plugins.scala

@@ -80,7 +80,7 @@ trait Plugins {
       }
     }
 
-    val plugs = pick(roughPluginsList, ctx.phasePlan.flatten.map(_.phaseName).toSet)
+    val plugs = pick(roughPluginsList, ctx.base.phasePlan.flatten.map(_.phaseName).toSet)
 
     // Verify required plugins are present.
     for (req <- ctx.settings.require.value ; if !(plugs exists (_.name == req)))

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

@@ -22,15 +22,15 @@ class PlainPrinter(_ctx: Context) extends Printer {
   protected def maxToTextRecursions = 100
 
   protected final def controlled(op: => Text): Text =
-    if (ctx.toTextRecursions < maxToTextRecursions && ctx.toTextRecursions < maxSummarized)
+    if (ctx.base.toTextRecursions < maxToTextRecursions && ctx.base.toTextRecursions < maxSummarized)
       try {
-        ctx.toTextRecursions += 1
+        ctx.base.toTextRecursions += 1
         op
       } finally {
-        ctx.toTextRecursions -= 1
+        ctx.base.toTextRecursions -= 1
       }
     else {
-      if (ctx.toTextRecursions >= maxToTextRecursions)
+      if (ctx.base.toTextRecursions >= maxToTextRecursions)
         recursionLimitExceeded()
       "..."
     }
@@ -522,7 +522,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
 
   def summarized[T](depth: Int)(op: => T): T = {
     val saved = maxSummarized
-    maxSummarized = ctx.toTextRecursions + depth
+    maxSummarized = ctx.base.toTextRecursions + depth
     try op
     finally maxSummarized = depth
   }

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

@@ -64,7 +64,7 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer {
 
   override def prepareForUnit(tree: Tree)(implicit ctx: Context) = {
     if (lazyValNullables == null)
-      lazyValNullables = ctx.collectNullableFieldsPhase.asInstanceOf[CollectNullableFields].lazyValNullables
+      lazyValNullables = ctx.base.collectNullableFieldsPhase.asInstanceOf[CollectNullableFields].lazyValNullables
     ctx
   }
 

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

@@ -101,7 +101,7 @@ class TreeChecker extends Phase with SymTransformer {
     if (ctx.settings.YtestPickler.value && ctx.phase.prev.isInstanceOf[Pickler])
       ctx.echo("Skipping Ycheck after pickling with -Ytest-pickler, the returned tree contains stale symbols")
     else
-      check(ctx.allPhases, ctx)
+      check(ctx.base.allPhases, ctx)
   }
 
   private def previousPhases(phases: List[Phase])(implicit ctx: Context): List[Phase] = phases match {
@@ -118,7 +118,7 @@ class TreeChecker extends Phase with SymTransformer {
 
   def check(phasesToRun: Seq[Phase], ctx: Context) = {
     val prevPhase = ctx.phase.prev // can be a mini-phase
-    val squahsedPhase = ctx.squashed(prevPhase)
+    val squahsedPhase = ctx.base.squashed(prevPhase)
     ctx.echo(s"checking ${ctx.compilationUnit} after phase ${squahsedPhase}")
 
     assertSelectWrapsNew(ctx.compilationUnit.tpdTree)(ctx)

compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala

@@ -16,7 +16,7 @@ class TreeTransformerTest extends DottyTest {
       implicit val ctx = context
       class EmptyTransform extends MiniPhase {
         override def phaseName: String = "empty"
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       val transformer = new MegaPhase(Array(new EmptyTransform))
       val transformed = transformer.transformUnit(tree)
@@ -34,7 +34,7 @@ class TreeTransformerTest extends DottyTest {
 
         override def transformLiteral(tree: tpd.Literal)(implicit ctx: Context): tpd.Tree = tpd.Literal(Constant(2))
         override def phaseName: String = "canReplaceConstant"
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       val transformer = new MegaPhase(Array(new ConstantTransform))
       val transformed = transformer.transformUnit(tree)
@@ -60,7 +60,7 @@ class TreeTransformerTest extends DottyTest {
           tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(2)))
         }
 
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       val transformer = new MegaPhase(Array(new Transformation))
       val tr = transformer.transformUnit(tree).toString
@@ -91,7 +91,7 @@ class TreeTransformerTest extends DottyTest {
           tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(2)))
         }
 
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       class Transformation2 extends MiniPhase {
         override def phaseName: String = "transformationOrder2"
@@ -102,7 +102,7 @@ class TreeTransformerTest extends DottyTest {
           tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(3)))
         }
 
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       val transformer = new MegaPhase(Array(new Transformation1, new Transformation2))
       val tr = transformer.transformUnit(tree).toString
@@ -135,7 +135,7 @@ class TreeTransformerTest extends DottyTest {
           tpd.cpy.ValDef(tree)(rhs = transformFollowing(tpd.Literal(Constant(2))))
         }
 
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       var transformed2 = 0
       class Transformation2 extends MiniPhase {
@@ -166,7 +166,7 @@ class TreeTransformerTest extends DottyTest {
           transformFollowing(tpd.cpy.ValDef(tree)(rhs = tpd.Literal(Constant(3))))
         }
 
-        init(ctx, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
+        init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
       }
       val transformer = new MegaPhase(Array(new Transformation1, new Transformation2))
       val tr = transformer.transformUnit(tree).toString