Skip to content

Commit 4b64eae

Browse files
committed
Try to fix pickling test
1 parent e08d48b commit 4b64eae

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1297,8 +1297,8 @@ class TreeUnpickler(reader: TastyReader,
12971297
}
12981298

12991299
val tree = if (tag < firstLengthTreeTag) readSimpleTerm() else readLengthTerm()
1300-
if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools
1301-
tree.overwriteType(tree.tpe.simplified)
1300+
// if (!tree.isInstanceOf[TypTree]) // FIXME: Necessary to avoid self-type cyclic reference in tasty_tools
1301+
// tree.overwriteType(tree.tpe.simplified)
13021302
setSpan(start, tree)
13031303
}
13041304

compiler/src/dotty/tools/dotc/printing/PlainPrinter.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class PlainPrinter(_ctx: Context) extends Printer {
6060
if !ctx.mode.is(Mode.Type) && annot.symbol == defn.UncheckedVarianceAnnot =>
6161
homogenize(parent)
6262
case tp: SkolemType =>
63-
homogenize(tp.info.dealiasKeepAnnots)
63+
homogenize(tp.info)
6464
case tp: LazyRef =>
6565
homogenize(tp.ref)
6666
case tp @ AppliedType(tycon, args) =>

0 commit comments

Comments
 (0)