Merged revisions 24591 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r24591 | dragos | 2011-03-25 18:10:01 +0100 (Fri, 25 Mar 2011) | 1 line

  Set the original tree for TypeTree in self-types, and making sure
there are no cycles in TypeTree.original. review by odersky. ........

Author: dragos

src/compiler/scala/tools/nsc/ast/Trees.scala

@@ -317,7 +317,15 @@ trait Trees extends reflect.generic.Trees { self: SymbolTable =>
     private[Trees] var wasEmpty: Boolean = false
 
     def original: Tree = orig
-    def setOriginal(tree: Tree): this.type = { orig = tree; setPos(tree.pos); this }
+    def setOriginal(tree: Tree): this.type = {
+      def followOriginal(t: Tree): Tree = t match {
+        case tt: TypeTree => followOriginal(tt.original)
+        case t => t
+      }
+
+      orig = followOriginal(tree); setPos(tree.pos);
+      this
+    }
 
     override def defineType(tp: Type): this.type = {
       wasEmpty = isEmpty

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -1425,7 +1425,7 @@ trait Typers extends Modes {
           val tpt1 =
             checkNoEscaping.privates(
               clazz.thisSym,
-              treeCopy.TypeTree(tpt) setType vd.symbol.tpe)
+              treeCopy.TypeTree(tpt).setOriginal(tpt) setType vd.symbol.tpe)
           treeCopy.ValDef(vd, mods, name, tpt1, EmptyTree) setType NoType
       }
 // was: