3 files changed, 2 insertions, 26 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 98fb6bd0ef..250feb69bf 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -234,14 +234,10 @@ abstract class SymbolLoaders {
         }
       }
       if (!root.isEmptyPackageClass) {
-        // Only enter packages which contain a class or a non-empty package
         for (pkg <- classpath.packages) {
-          if (pkg.isEmptyOfClassfiles) {
-            log(s"Discarding $root/$pkg as it contains no classfiles.")
-          }
-          else
-            enterPackage(root, pkg.name, new PackageLoader(pkg))
+          enterPackage(root, pkg.name, new PackageLoader(pkg))
         }
+
         openPackageModule(root)
       }
     }
diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala
index 536a281e6c..7f9b81e1ec 100644
--- a/src/compiler/scala/tools/nsc/util/ClassPath.scala
+++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala
@@ -211,8 +211,6 @@ abstract class ClassPath[T] {
   def validPackage(name: String)    = (name != "META-INF") && (name != "") && (name.charAt(0) != '.')
   def validSourceFile(name: String) = endsScala(name) || endsJava(name)
 
-  def isEmptyOfClassfiles: Boolean = classes.isEmpty && packages.forall(_.isEmptyOfClassfiles)
-
   /**
    * Find a ClassRep given a class name of the form "package.subpackage.ClassName".
    * Does not support nested classes on .NET
diff --git a/test/files/run/t6039.scala b/test/files/run/t6039.scala
deleted file mode 100644
index 9d811b0634..0000000000
--- a/test/files/run/t6039.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-import scala.tools.partest._
-
-object Test extends StoreReporterDirectTest {
-  private def compileCode(): Boolean = {
-    new java.io.File("util") mkdirs
-    val classpath = List(sys.props("partest.lib"), ".") mkString sys.props("path.separator")
-    log(s"classpath = $classpath")
-    compileString(newCompiler("-cp", classpath, "-d", testOutput.path))(packageCode)
-  }
-  def code = ???
-  def packageCode = """
-package scala.bippy
-class A { new util.Random() }
-"""
-  def show(): Unit = {
-    assert(compileCode(), filteredInfos take 1 mkString "")
-  }
-}