summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/symtab
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-05-31 03:21:05 -0700
committerPaul Phillips <paulp@improving.org>2013-05-31 03:23:36 -0700
commit9c2972379459f655f20da7cba88707ed27ac7c86 (patch)
tree0735619166325c61115de22d46c3c87a4af488f0 /src/compiler/scala/tools/nsc/symtab
parent1c6a0cf75592c201e27a6e11140c6da87de67123 (diff)
downloadscala-9c2972379459f655f20da7cba88707ed27ac7c86.tar.gz
scala-9c2972379459f655f20da7cba88707ed27ac7c86.tar.bz2
scala-9c2972379459f655f20da7cba88707ed27ac7c86.zip
Revert "SI-6039 Harden against irrelevant filesystem details"
This reverts commit b0758f5cb9d966b940933d48bdbb45d17a80de66. This commit sent startup time through the roof, at least in some circumstances (it is presumably related to one's current working directory.)
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala8
1 files changed, 2 insertions, 6 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)
}
}