TreeUnpickler: avoid forcing annotations early

smarter · smarter · commit eeb314f2aa9e · 2019-01-29T15:57:10.000+01:00
This sometimes lead to cycles when compiling the 2.13 stdlib and shouldn't
be necessary anymore (all the tests pass).
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -839,13 +839,6 @@ class TreeUnpickler(reader: TastyReader,
             DefDef(Nil, Nil, tpt)
           }
       }
-      val mods =
-        if (sym.annotations.isEmpty) untpd.EmptyModifiers
-        else untpd.Modifiers(annotations = sym.annotations.map(_.tree))
-      tree.withMods(mods)
-        // record annotations in tree so that tree positions can be filled in.
-        // Note: Once the inline PR with its changes to positions is in, this should be
-        // no longer necessary.
       goto(end)
       setSpan(start, tree)
       if (!sym.isType) { // Only terms might have leaky aliases, see the documentation of `checkNoPrivateLeaks`

Original file line number	Diff line number	Diff line change
`@@ -839,13 +839,6 @@ class TreeUnpickler(reader: TastyReader,`
`839`	`839`	`DefDef(Nil, Nil, tpt)`
`840`	`840`	`}`
`841`	`841`	`}`
`842`		`- val mods =`
`843`		`- if (sym.annotations.isEmpty) untpd.EmptyModifiers`
`844`		`- else untpd.Modifiers(annotations = sym.annotations.map(_.tree))`
`845`		`- tree.withMods(mods)`
`846`		`- // record annotations in tree so that tree positions can be filled in.`
`847`		`- // Note: Once the inline PR with its changes to positions is in, this should be`
`848`		`- // no longer necessary.`
`849`	`842`	`goto(end)`
`850`	`843`	`setSpan(start, tree)`
`851`	`844`	if (!sym.isType) { // Only terms might have leaky aliases, see the documentation of `checkNoPrivateLeaks`