Merge pull request #12873 from dotty-staging/backport-unpickle-param-…

…cycle [backport] TreeUnpickler: fix cycle involving param accessor
scala · Jun 21, 2021 · 0c8bb6c · 0c8bb6c
2 parents c45fce3 + 40e437f
commit 0c8bb6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -881,7 +881,12 @@ class TreeUnpickler(reader: TastyReader,
       }
       goto(end)
       setSpan(start, tree)
-      if (!sym.isType) // Only terms might have leaky aliases, see the documentation of `checkNoPrivateLeaks`
+
+      // Dealias any non-accessible type alias in the type of `sym`. This can be
+      // skipped for types (see `checkNoPrivateLeaks` for why) as well as for
+      // param accessors since they can't refer to an inaccesible type member of
+      // the class.
+      if !sym.isType && !sym.is(ParamAccessor) then
         sym.info = ta.avoidPrivateLeaks(sym)
 
       if (ctx.settings.YreadComments.value) {

diff --git a/tests/pos/i12834.scala b/tests/pos/i12834.scala
@@ -0,0 +1,2 @@
+class A(val ref: Option[B])
+class B extends A(None)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		class A(val ref: Option[B])
		class B extends A(None)