Restored the disabled exception in classfilepar...

Restored the disabled exception in classfileparser. Strange quick
behavior was being caused by multiple occurrences of some classpath
elements. No review.

2 files changed, 12 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 1f1a41055c..745761a065 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -429,8 +429,10 @@ abstract class ClassfileParser {
       }
     }
 
-    if (c != clazz && externalName.toString.indexOf("$") < 0 && (clazz eq NoSymbol) && (c ne NoSymbol))
-      clazz = c
+    if (c != clazz && externalName.toString.indexOf("$") < 0) {
+      if ((clazz eq NoSymbol) && (c ne NoSymbol)) clazz = c
+      else throw new IOException("class file '" + in.file + "' contains wrong " + c)
+    }
 
     addEnclosingTParams(clazz)
     parseInnerClasses() // also sets the isScala / isScalaRaw / hasMeta flags, see r15956
diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala
index e3195eb767..9feb61e0a3 100644
--- a/src/compiler/scala/tools/util/PathResolver.scala
+++ b/src/compiler/scala/tools/util/PathResolver.scala
@@ -115,10 +115,14 @@ object PathResolver {
       else if (scalaLibAsDir.isDirectory) scalaLibAsDir.path
       else ""
 
-    def scalaBootClassPath = scalaLibDirFound match {
-      case Some(dir)    => join(ClassPath expandDir dir.path)
-      case _            => ""
-    }
+    // This attempt to duplicate the original logic of MainGenericRunner
+    // was causing the issue described in r20878.  Obviously it's past time
+    // to establish with certainty what each of these paths should contain.
+    def scalaBootClassPath = ""
+    // scalaLibDirFound match {
+    //   case Some(dir)    => join(ClassPath expandDir dir.path)
+    //   case _            => ""
+    // }
 
     def scalaExtDirs        = Environment.scalaExtDirs
     def scalaPluginDirs     = List("misc", "scala-devel", "plugins")