Merge pull request scala#11103 from som-snytt/issue/13115-leading-parser-crash

Load package objects when failing early

Author: lrytz

src/compiler/scala/tools/nsc/Global.scala

@@ -1378,7 +1378,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
      */
     val parserPhase                  = phaseNamed("parser")
     val namerPhase                   = phaseNamed("namer")
-    // val packageobjectsPhase          = phaseNamed("packageobjects")
+    val packageobjectsPhase          = phaseNamed("packageobjects")
     val typerPhase                   = phaseNamed("typer")
     // val inlineclassesPhase           = phaseNamed("inlineclasses")
     // val superaccessorsPhase          = phaseNamed("superaccessors")
@@ -1484,7 +1484,7 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
         showDef(splitClassAndPhase(settings.Xshowobj.value, term = true), declsOnly = false, globalPhase)
     }
 
-    // Similarly, this will only be created under -Yshow-syms.
+    // Similarly, this will only be created under -Vsymbols.
     object trackerFactory extends SymbolTrackers {
       val global: Global.this.type = Global.this
       lazy val trackers = currentRun.units.toList map (x => SymbolTracker(x))
@@ -1564,6 +1564,9 @@ class Global(var currentSettings: Settings, reporter0: Reporter)
         if (timePhases)
           informTime(globalPhase.description, phaseTimer.nanos)
 
+        if (reporter.hasErrors && !isPast(packageobjectsPhase))
+          packageobjectsPhase.run()
+
         // progress update
         if (settings.Xprint.containsPhase(globalPhase) || settings.printLate.value && runIsAt(cleanupPhase)) {
           // print trees

src/compiler/scala/tools/nsc/typechecker/Analyzer.scala

@@ -75,11 +75,11 @@ trait Analyzer extends AnyRef
       val openPackageObjectsTraverser = new InternalTraverser {
         override def traverse(tree: Tree): Unit = tree match {
           case ModuleDef(_, _, _) =>
-            if (tree.symbol.name == nme.PACKAGEkw) {
-              // we've actually got a source file
-              deferredOpen.subtractOne(tree.symbol.owner)
-
-              openPackageModule(tree.symbol, tree.symbol.owner)
+            val sym = tree.symbol
+            if (sym.name == nme.PACKAGEkw) {
+              val owner = sym.owner
+              deferredOpen.subtractOne(owner) // we've actually got a source file
+              openPackageModule(sym, owner)
             }
           case ClassDef(_, _, _, _) => () // make it fast
           case _ => tree.traverse(this)
@@ -93,13 +93,12 @@ trait Analyzer extends AnyRef
       override def run(): Unit = {
         super.run()
 
-        for (sym <- deferredOpen.toVector) {
-          if (deferredOpen.remove(sym)) {
-            // this can remove entries from `deferredOpen`, hence the copy to a vector
-            // and the check of `remove` return value
-            openPackageModule(sym)
-          }
-        }
+        // openPackageModule can remove entries from `deferredOpen`, so make a defensive copy first,
+        // and then check whether `remove` says the sym is still deferred.
+        // `force` the open because we might be called earlier if the run is bailing on an early error.
+        for (sym <- deferredOpen.toVector)
+          if (deferredOpen.remove(sym))
+            openPackageModule(sym, force = true)
       }
     }
   }

test/files/run/t13115.check

@@ -0,0 +1,18 @@
+Doing first compilation
+scripteditor:7: error: ')' expected but '}' found.
+      }
+      ^
+Compilation failed!
+Compilation successful!
+scripteditor:4: error: not found: value printlnx
+          printlnx("Hi there!")
+          ^
+Compilation failed!
+scripteditor:7: error: ')' expected but '}' found.
+      }
+      ^
+Compilation failed!
+
+
+Doing last compilation
+Compilation successful!

test/files/run/t13115.scala

@@ -0,0 +1,75 @@
+///> using dep org.scala-lang:scala-compiler:2.13.7
+
+import scala.tools.nsc.{Global, Settings}
+import scala.reflect.internal.util.BatchSourceFile
+import scala.tools.nsc.io.VirtualDirectory
+
+object Test {
+  val virtualDirectory = new VirtualDirectory("(memory)", None)
+  val settings = new Settings()
+  settings.usejavacp.value = true
+  settings.outputDirs.setSingleOutput(virtualDirectory)
+  //settings.processArgumentString("-Vdebug-type-error -deprecation -Vsymbols -Xdev -Vprint:_ -Vdebug -Vlog:_")
+  val global = new Global(settings)
+
+  def main(args: Array[String]): Unit = {
+    val codeWithNoError =
+      """
+      class Hello1 {
+        def hello(): Unit = {
+          println("Hi there!")
+        }
+      }
+    """
+
+    val codeWithBenignError =
+      """
+      class Hello2 {
+        def hello(): Unit = {
+          printlnx("Hi there!")
+        }
+      }
+    """
+
+    val codeWithDeadlyError =
+      """
+      class Hello3 {
+        def pic = 20
+        def makePic(s: Int = {
+            pic
+        }
+      }
+    """
+
+    val code2WithNoError =
+      """
+      class Hello4 {
+        def hello(): Unit = {
+          val x = Seq(1, 2, 3)
+          println(x)
+        }
+      }
+    """
+
+    println("Doing first compilation")
+    compileCode(codeWithDeadlyError) // early error broke package object loading
+    compileCode(codeWithNoError)
+    compileCode(codeWithBenignError)
+    compileCode(codeWithDeadlyError)
+
+    println("\n\nDoing last compilation")
+    compileCode(code2WithNoError)
+  }
+
+  def compileCode(code: String): Unit = {
+    val run = new global.Run
+    val sourceFile = new BatchSourceFile("scripteditor", code)
+    global.reporter.reset()
+    run.compileSources(List(sourceFile))
+    if (global.reporter.hasErrors) {
+      println("Compilation failed!")
+    } else {
+      println("Compilation successful!")
+    }
+  }
+}