Revert store

Author: som-snytt

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

@@ -45,23 +45,19 @@ import scala.util.chaining.given
 
 object Contexts:
 
-  private var _initialStore        = Store.empty
-  private def newLocation[A]()     = { val (loc, s) = _initialStore.newLocation[A]() ; _initialStore = s ; loc }
-  private def newLocation[A](a: A) = { val (loc, s) = _initialStore.newLocation[A](a) ; _initialStore = s ; loc }
-
-  private val compilerCallbackLoc = newLocation[CompilerCallback]()
-  private val sbtCallbackLoc      = newLocation[AnalysisCallback]()
-  private val printerFnLoc        = newLocation[Context => Printer](new RefinedPrinter(_))
-  private val settingsStateLoc    = newLocation[SettingsState]()
-  private val compilationUnitLoc  = newLocation[CompilationUnit]()
-  private val runLoc              = newLocation[Run]()
-  private val profilerLoc         = newLocation[Profiler]()
-  private val notNullInfosLoc     = newLocation[List[NotNullInfo]]()
-  private val importInfoLoc       = newLocation[ImportInfo]()
-  private val typeAssignerLoc     = newLocation[TypeAssigner](TypeAssigner)
-  private val usagesLoc           = newLocation[Usages](Usages())
-
-  private val initialStore = _initialStore
+  private val (compilerCallbackLoc, store1) = Store.empty.newLocation[CompilerCallback]()
+  private val (sbtCallbackLoc,      store2) = store1.newLocation[AnalysisCallback]()
+  private val (printerFnLoc,        store3) = store2.newLocation[Context => Printer](new RefinedPrinter(_))
+  private val (settingsStateLoc,    store4) = store3.newLocation[SettingsState]()
+  private val (compilationUnitLoc,  store5) = store4.newLocation[CompilationUnit]()
+  private val (runLoc,              store6) = store5.newLocation[Run]()
+  private val (profilerLoc,         store7) = store6.newLocation[Profiler]()
+  private val (notNullInfosLoc,     store8) = store7.newLocation[List[NotNullInfo]]()
+  private val (importInfoLoc,       store9) = store8.newLocation[ImportInfo]()
+  private val (typeAssignerLoc,    store10) = store9.newLocation[TypeAssigner](TypeAssigner)
+  private val (usagesLoc,          store11) = store10.newLocation[Usages](Usages())
+
+  private val initialStore = store11
 
   /** The current context */
   inline def ctx(using ctx: Context): Context = ctx