Correcting resolution of top-level objects in r...

Correcting resolution of top-level objects in reflection.

4 files changed, 17 insertions, 9 deletions

diff --git a/src/compiler/scala/reflect/runtime/JavaToScala.scala b/src/compiler/scala/reflect/runtime/JavaToScala.scala
index 3f2f2321b8..0c7f54e1bb 100644
--- a/src/compiler/scala/reflect/runtime/JavaToScala.scala
+++ b/src/compiler/scala/reflect/runtime/JavaToScala.scala
@@ -38,6 +38,15 @@ trait JavaToScala extends ConversionUtil { self: SymbolTable =>
   def javaClass(path: String): jClass[_] =
     jClass.forName(path, false, java.lang.ClassLoader.getSystemClassLoader)
 
+  /** Does `path` correspond to a Java class with that fully qualified name? */
+  def isJavaClass(path: String): Boolean =
+    try {
+      javaClass(path)
+      true
+    } catch {
+      case (_: ClassNotFoundException) | (_: NoClassDefFoundError) =>
+      false
+    }
 
   /**
    * Generate types for top-level Scala root class and root companion object
diff --git a/src/compiler/scala/reflect/runtime/Loaders.scala b/src/compiler/scala/reflect/runtime/Loaders.scala
index 28f528b965..a38328ab63 100644
--- a/src/compiler/scala/reflect/runtime/Loaders.scala
+++ b/src/compiler/scala/reflect/runtime/Loaders.scala
@@ -106,16 +106,14 @@ trait Loaders { self: SymbolTable =>
         val path =
           if (pkgClass.isEmptyPackageClass) name.toString
           else pkgClass.fullName + "." + name
-        try {
-          javaClass(path)
+        if (isJavaClass(path)) {
           val (clazz, module) = createClassModule(pkgClass, name.toTypeName, new TopClassCompleter(_, _))
           info("created "+module+"/"+module.moduleClass+" in "+pkgClass)
           lookupEntry(name)
-        } catch {
-          case (_: ClassNotFoundException) | (_: NoClassDefFoundError) =>
-            info("*** not found : "+path)
-            negatives += name
-            null
+        } else {
+          info("*** not found : "+path)
+          negatives += name
+          null
         }
       }
     }
diff --git a/src/compiler/scala/reflect/runtime/SymbolTable.scala b/src/compiler/scala/reflect/runtime/SymbolTable.scala
index 62784d8973..c54205de9f 100644
--- a/src/compiler/scala/reflect/runtime/SymbolTable.scala
+++ b/src/compiler/scala/reflect/runtime/SymbolTable.scala
@@ -12,7 +12,8 @@ trait SymbolTable extends internal.SymbolTable with JavaToScala with ScalaToJava
    *  <owner>.<name>, otherwise return NoSymbol
    */
   override def missingHook(owner: Symbol, name: Name): Symbol =
-    if (name.isTermName && owner.hasPackageFlag)
+    if (name.isTermName && owner.hasPackageFlag &&
+        !(owner.isRoot && isJavaClass(name.toString))) // top-level classes go into empty package, not root
       makeScalaPackage(if (owner.isRoot) name.toString else owner.fullName+"."+name).sourceModule
     else {
       info("*** missing: "+name+"/"+name.isTermName+"/"+owner+"/"+owner.hasPackageFlag+"/"+owner.info.decls.getClass)
diff --git a/test/disabled/run/code.scala b/test/disabled/run/code.scala
index 7074943206..1a9c97177d 100644
--- a/test/disabled/run/code.scala
+++ b/test/disabled/run/code.scala
@@ -10,7 +10,7 @@ object Test extends App {
   }
   CodeTest(foo(List(2)), args)
   CodeTest({() => val e = Element("someName"); e}, args)
-//  CodeTest({() => val e = InnerElement("someName"); e}, args) // (does not work yet)
+  CodeTest({() => val e = InnerElement("someName"); e}, args) // (does not work yet)
   def titi() = {
     var truc = 0
     CodeTest(() => {