Updated Symbol to record classfile origin.

This change should be transparent to anything using sourceFile,
unless it was drinking from the inheritance well too deeply. Rather
than squander the already allocated field for every ClassSymbol not
being compiled from source, I'm now populating it with the file
representing the class. This will make a broad range of things easier,
like debugging, issuing useful error messages, symbol invalidation,
signature verification, you name it.

  def sourceFile      - still returns only source code files
  def binaryFile      - returns only class files
  def associatedFile  - returns whatever is there, if anything

Performance: I may be mistaken, but I believe this is a zero-impact
change.  No new fields are allocated; fields which were null now hold
a useful reference.  The reference is to a file instance which was
already being allocated and already long-lived.

Compare error messages:

  // Version 1
  % scalac a.scala
  error: type _$1 is defined twice

  // Version 2
  % scalac a.scala
  error: type _$1 is defined twice
    conflicting symbols both originated in file './foo/package.class'
    Note: this may be due to a bug in the compiler involving wildcards in package objects
  one error found

Bonus for people who read commit logs.  Try this in the repl
after starting power mode.

ListClass.info.members groupBy (_.associatedFile) foreach {
  case (k, vs) => println("%s\n  %s\n".format(k, vs map (_.defString) mkString "\n  "))
}

1 files changed, 5 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index 0117bfb037..ef73d6db1a 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -1064,7 +1064,8 @@ abstract class ClassfileParser {
     def className(name: Name): Name =
       name.subName(name.lastPos('.') + 1, name.length)
 
-    def enterClassAndModule(entry: InnerClassEntry, completer: global.loaders.SymbolLoader, jflags: Int) {
+    def enterClassAndModule(entry: InnerClassEntry, file: AbstractFile, jflags: Int) {
+      val completer   = new global.loaders.ClassfileLoader(file)
       val name        = entry.originalName
       var sflags      = toScalaClassFlags(jflags)
       val owner       = getOwner(jflags)
@@ -1073,6 +1074,8 @@ abstract class ClassfileParser {
       val innerModule = owner.newModule(name.toTermName, NoPosition, sflags) setInfo completer
 
       innerModule.moduleClass setInfo global.loaders.moduleClassLoader
+      List(innerClass, innerModule.moduleClass) foreach (_.associatedFile = file)
+
       scope enter innerClass
       scope enter innerModule
 
@@ -1094,7 +1097,7 @@ abstract class ClassfileParser {
         val file = global.classPath.findSourceFile(entry.externalName.toString) getOrElse {
           throw new AssertionError(entry.externalName)
         }
-        enterClassAndModule(entry, new global.loaders.ClassfileLoader(file), entry.jflags)
+        enterClassAndModule(entry, file, entry.jflags)
       }
     }
   }