myContext gone

Author: adampauls

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

@@ -81,8 +81,6 @@ class CompilationUnit protected (val source: SourceFile) {
 
   private var myAssignmentSpans: Map[Int, List[Span]] = null
 
-  var myContext: Context = null
-
   /** A map from (name-) offsets of all local variables in this compilation unit
    *  that can be tracked for being not null to the list of spans of assignments
    *  to these variables.

compiler/src/dotty/tools/dotc/parsing/ParserPhase.scala

@@ -49,13 +49,11 @@ class Parser extends Phase {
   override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] = {
     val unitContexts =
       for unit <- units yield
-        report.inform(s"running typer on ${unit.source}")
-        val newCtx = ctx.fresh.setCompilationUnit(unit).withRootImports
-        unit.myContext = newCtx
-        newCtx
+        report.inform(s"running parser on ${unit.source}")
+        ctx.fresh.setCompilationUnit(unit).withRootImports
+
     unitContexts.foreach(parse(using _))
     record("parsedTrees", ast.Trees.ntrees)
-    
 
     unitContexts.map(_.compilationUnit)
   }

compiler/src/dotty/tools/dotc/typer/TyperPhase.scala

@@ -74,14 +74,16 @@ class TyperPhase extends Phase {
     unit.isJava || unit.suspended
 
   override def runOn(units: List[CompilationUnit])(using Context): List[CompilationUnit] =
-    val unitContextsForSyms =
+    val unitContexts =
       for unit <- units yield
-        Option(unit.myContext).map(_.fresh.setPhase(this.start).setCompilationUnit(unit).withRootImports).getOrElse {
-          // This happens in the REPL when parsing is done externally
-          ctx.fresh.setCompilationUnit(unit)
-        }
-
-    remaining = unitContextsForSyms
+        val newCtx = ctx.fresh.setPhase(this.start).setCompilationUnit(unit)
+        // TODO without this test, dotty.tools.repl.ScriptedTests fails. Not sure why.
+        if (this.start > Periods.FirstPhaseId)
+          newCtx.withRootImports
+        else
+          newCtx
+
+    remaining = unitContexts
     while remaining.nonEmpty do
       enterSyms(using remaining.head)
       remaining = remaining.tail
@@ -95,11 +97,6 @@ class TyperPhase extends Phase {
       case _ =>
     }
 
-    val unitContexts = unitContextsForSyms
-      //for unit <- units yield
-        //unit.myContext.fresh.setPhase(this.start).setCompilationUnit(unit).withRootImports
-
-
     unitContexts.foreach(typeCheck(using _))
     record("total trees after typer", ast.Trees.ntrees)
     unitContexts.foreach(javaCheck(using _)) // after typechecking to avoid cycles