Merge pull request #5514 from dotty-staging/fix-unpickling-rectype

Fix #5488: properly unpickle RecTypes

Author: odersky

compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala

@@ -393,7 +393,13 @@ class TreeUnpickler(reader: TastyReader,
         case THIS =>
           ThisType.raw(readType().asInstanceOf[TypeRef])
         case RECtype =>
-          typeAtAddr.getOrElse(start, RecType(rt => registeringType(rt, readType())))
+          typeAtAddr.get(start) match {
+            case Some(tp) =>
+              skipTree(tag)
+              tp
+            case None =>
+              RecType(rt => registeringType(rt, readType()))
+          }
         case RECthis =>
           readTypeRef().asInstanceOf[RecType].recThis
         case TYPEALIAS =>

compiler/test/dotc/pos-decompilation.blacklist

@@ -12,3 +12,6 @@ tcpoly_checkkinds_mix.scala
 i3050.scala
 i4006b.scala
 i4006c.scala
+
+# Decompiling RecThis as "this" is incorrect
+avoid.scala

tests/pos/avoid.scala

@@ -9,6 +9,8 @@ object test {
   val z: String = x.y
 }
 
+trait M
+
 // A tricky case involving inner classes, exercised
 // in the large in dotty.tools.dotc.core.NameKinds.scala.
 object Test2 {
@@ -24,4 +26,9 @@ object Test2 {
     class C extends NK { type T = I }
     new C
   }
+
+  val z = {
+    class C extends NK { type T = I }
+    new C with M
+  }
 }