Specialization landed in trunk.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala
index d1902a2983..90281047f4 100644
--- a/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala
+++ b/src/compiler/scala/tools/nsc/transform/TypingTransformers.scala
@@ -28,7 +28,8 @@ trait TypingTransformers {
 
     def atOwner[A](tree: Tree, owner: Symbol)(trans: => A): A = {
       val savedLocalTyper = localTyper
-      localTyper = localTyper.atOwner(tree, owner)
+//      println("ttransformer atOwner: " + owner + " isPackage? " + owner.isPackage)
+      localTyper = localTyper.atOwner(tree, if (owner.isModule) owner.moduleClass else owner)
       typers += Pair(owner, localTyper)
       val result = super.atOwner(owner)(trans)
       localTyper = savedLocalTyper
@@ -42,6 +43,8 @@ trait TypingTransformers {
         case Template(_, _, _) =>
           // enter template into context chain
           atOwner(currentOwner) { super.transform(tree) }
+        case PackageDef(_, _) =>
+          atOwner(tree.symbol) { super.transform(tree) }
         case _ =>
           super.transform(tree)
       }