Merge pull request #4117 from dotty-staging/fix/tasty-empty-pkg

Do not pickle empty packages

Author: smarter

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -633,7 +633,11 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
   /** The tree containing only the top-level classes and objects matching either `cls` or its companion object */
   def sliceTopLevel(tree: Tree, cls: ClassSymbol)(implicit ctx: Context): List[Tree] = tree match {
     case PackageDef(pid, stats) =>
-      cpy.PackageDef(tree)(pid, stats.flatMap(sliceTopLevel(_, cls))) :: Nil
+      val slicedStats = stats.flatMap(sliceTopLevel(_, cls))
+      if (!slicedStats.isEmpty)
+        cpy.PackageDef(tree)(pid, slicedStats) :: Nil
+      else
+        Nil
     case tdef: TypeDef =>
       val sym = tdef.symbol
       assert(sym.isClass)

compiler/src/dotty/tools/dotc/transform/FirstTransform.scala

@@ -116,10 +116,6 @@ class FirstTransform extends MiniPhase with InfoTransformer { thisPhase =>
     cpy.Template(impl)(self = EmptyValDef)
   }
 
-  /** Eliminate empty package definitions that may have been stored in the TASTY trees */
-  override def transformPackageDef(tree: PackageDef)(implicit ctx: Context): Tree =
-    if (tree.stats.isEmpty) EmptyTree else tree
-
   override def transformDefDef(ddef: DefDef)(implicit ctx: Context) = {
     if (ddef.symbol.hasAnnotation(defn.NativeAnnot)) {
       ddef.symbol.resetFlag(Deferred)

compiler/test/dotty/tools/dotc/FromTastyTests.scala

@@ -47,7 +47,6 @@ class FromTastyTests extends ParallelTesting {
         "hklub0.scala",
 
         // Missing position
-        "i3000.scala",
         "t1203a.scala",
         "t2260.scala",
         "t4579.scala",