- Removed special case for scala.Object (which ...

- Removed special case for scala.Object (which doesn't exist any more).

1 files changed, 7 insertions, 11 deletions

diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java
index c4f6636aee..c3f4879af0 100644
--- a/sources/scalac/symtab/classfile/PackageParser.java
+++ b/sources/scalac/symtab/classfile/PackageParser.java
@@ -101,17 +101,13 @@ public class PackageParser extends MetadataParser {
 			    classCompletion.staticsParser(clazz));
 		        // enter class
 		        locals.enter(clazz);
-		        // enter module, except for scala.Object class
-		        // todo: why not there also?.
-		        if (!(n == Names.Object.toTypeName() &&
-			      p.fullName().toTermName() == Names.scala)) {
-			    Scope.Entry e = locals.lookupEntry(clazz.module().name);
-			    if (e != Scope.Entry.NONE) {
-			        // we already have a package of the same name; delete it
-			        locals.unlink(e);
-			    }
-			    locals.enter(clazz.module());
-		        }
+		        // enter module
+                        Scope.Entry e = locals.lookupEntry(clazz.module().name);
+                        if (e != Scope.Entry.NONE) {
+                            // we already have a package of the same name; delete it
+                            locals.unlink(e);
+                        }
+                        locals.enter(clazz.module());
 			symFile.put(clazz, f);
                     }
                 } else if (inclClasses && fname.endsWith(".scala")) {