Merge pull request #14506 from dotty-staging/fix-pickling

Disable type simplify in unpickler
scala · Feb 17, 2022 · 7015237 · 7015237
2 parents 0e479ee + 8f50785
commit 7015237
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -1297,8 +1297,6 @@ class TreeUnpickler(reader: TastyReader,
       }
 
       val tree = if (tag < firstLengthTreeTag) readSimpleTerm() else readLengthTerm()
-      if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools
-        tree.overwriteType(tree.tpe.simplified)
       setSpan(start, tree)
     }
 

diff --git a/tests/pos/pickleSkolem.scala b/tests/pos/pickleSkolem.scala
@@ -0,0 +1,15 @@
+class A
+
+type B = A
+
+def f[T](x: T): x.type & T = ???
+
+def g = {
+  var a: B = ???
+  f[A](a)
+}
+
+def testNN = {
+  var s: String = ???
+  s.nn
+}