Fix the Toolbox and PC failures

dwijnand · dwijnand · commit 17b085a602a0 · 2021-06-10T15:28:31.000+01:00
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
@@ -81,7 +81,9 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
   import definitions.findNamedMember
   def findMemberFromRoot(fullName: Name): Symbol = rootMirror.findMemberFromRoot(fullName)
   override def deferredOpenPackageModule(container: Symbol, dest: Symbol): Unit = {
-    if (isPast(currentRun.packageobjectsPhase)) {
+    // Some compiler runs (e.g. Toolbox and the PC) just initialise Global and then discard the Run
+    // such that the scala package object decls never get entered into the scala package
+    if ((curRun eq null) || !isGlobalInitialized || isPastPackageObjects) {
       super.openPackageModule(container, dest)
     } else {
       analyzer.packageObjects.deferredOpen(dest) = container
@@ -1023,6 +1025,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
   )
   override def isPastTyper = isPast(currentRun.typerPhase)
   def isBeforeErasure      = isBefore(currentRun.erasurePhase)
+  def isPastPackageObjects = isPast(currentRun.packageobjectsPhase)
   def isPast(phase: Phase) = (
        (curRun ne null)
     && isGlobalInitialized // defense against init order issues
@@ -1655,8 +1658,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
         compileLate(new CompilationUnit(scripted(getSourceFile(file))))
     }
 
-    /** Compile abstract file until `globalPhase`, but at least to phase "namer".
-     */
+    /** Compile the unit until `globalPhase`, but at least to phase "typer". */
     def compileLate(unit: CompilationUnit): Unit = {
       addUnit(unit)
 
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -1355,6 +1355,13 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
     }
   }
 
+  override def isPastPackageObjects = {
+    (if (currentTyperRun == null) NoCompilationUnit else currentTyperRun.currentUnit) match {
+      case unit: RichCompilationUnit => unit.isParsed
+      case _                         => super.isPastPackageObjects
+    }
+  }
+
   def newTyperRun(): Unit = {
     currentTyperRun = new TyperRun
   }

Original file line number	Diff line number	Diff line change
`@@ -1355,6 +1355,13 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")`
`1355`	`1355`	`}`
`1356`	`1356`	`}`
`1357`	`1357`
	`1358`	`+ override def isPastPackageObjects = {`
	`1359`	`+ (if (currentTyperRun == null) NoCompilationUnit else currentTyperRun.currentUnit) match {`
	`1360`	`+ case unit: RichCompilationUnit => unit.isParsed`
	`1361`	`+ case _ => super.isPastPackageObjects`
	`1362`	`+ }`
	`1363`	`+ }`
	`1364`	`+`
`1358`	`1365`	`def newTyperRun(): Unit = {`
`1359`	`1366`	`currentTyperRun = new TyperRun`
`1360`	`1367`	`}`