I really don't know the proper way to fix it in...

I really don't know the proper way to fix it in the current setting, so
just guarding.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala
index aa139d3a92..afb4c2268e 100644
--- a/src/compiler/scala/tools/nsc/interactive/Global.scala
+++ b/src/compiler/scala/tools/nsc/interactive/Global.scala
@@ -153,7 +153,14 @@ self =>
   override lazy val loaders = new SymbolLoaders {
     val global: Global.this.type = Global.this
     override def enterToplevelsFromSource(root: Symbol, name: String, src: AbstractFile) {
-      currentRun.compileLate(src) // todo: change
+      // todo: change
+      if (root.isEmptyPackageClass) {
+	// currentRun is null for the empty package, since its type is taken during currentRun
+	// initialization. todo: remove when refactored.
+	super.enterToplevelsFromSource(root, name, src)
+      } else {
+	currentRun.compileLate(src)
+      }
     }
   }