2 files changed, 7 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 86fd94110d..94997532f2 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -156,11 +156,12 @@ trait Namers requires Analyzer {
         m = context.owner.newModule(pos, name);
         m.setFlag(flags);
         m.moduleClass.setFlag(flags | inConstructorFlag);
-        if (m.owner.isPackageClass)
-          m.moduleClass.sourceFile = context.unit.source.getFile();
 	enterInScope(m)
       }
-      if (m.owner.isPackageClass) currentRun.symSource(m) = context.unit.source.getFile();
+      if (m.owner.isPackageClass) {
+        m.moduleClass.sourceFile = context.unit.source.getFile();
+        currentRun.symSource(m) = m.moduleClass.sourceFile
+      }
       m
     }
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index afaf39be20..82c7e608b2 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -28,8 +28,8 @@ mixin class Typers requires Analyzer {
 
   def resetTyper: unit = {
     resetContexts
-    if (transformed != null) transformed.clear
-    if (superDefs != null) superDefs.clear
+    transformed.clear
+    superDefs.clear
   }
 
   def newTyper(context: Context): Typer = new Typer(context)
@@ -589,6 +589,7 @@ mixin class Typers requires Analyzer {
     }
 
     def typedModuleDef(mdef: ModuleDef): Tree = {
+      System.out.println("sourcefile of " + mdef.symbol + "=" + mdef.symbol.sourceFile);
       val clazz = mdef.symbol.moduleClass
       val impl1 = newTyper(context.make(mdef.impl, clazz, new Scope()))
         .typedTemplate(mdef.impl, parentTypes(mdef.impl))