diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala index 1c77d84af3af..1ff1642ecce1 100644 --- a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala +++ b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala @@ -81,6 +81,4 @@ class TastyPickler(val rootCls: ClassSymbol) { assert(all.length == totalSize && all.bytes.length == totalSize, s"totalSize = $totalSize, all.length = ${all.length}, all.bytes.length = ${all.bytes.length}") all.bytes } - - val treePkl: TreePickler = new TreePickler(this) } diff --git a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala index c76bb593875b..9de869c994e6 100644 --- a/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala +++ b/compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala @@ -8,7 +8,7 @@ import dotty.tools.dotc.core.Decorators._ import dotty.tools.dotc.core.Mode import dotty.tools.dotc.core.Symbols._ import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter } +import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter, TreePickler } import dotty.tools.dotc.core.tasty.DottyUnpickler import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode import dotty.tools.dotc.report @@ -154,7 +154,7 @@ object PickledQuotes { private def pickle(tree: Tree)(using Context): Array[Byte] = { quotePickling.println(i"**** pickling quote of\n$tree") val pickler = new TastyPickler(defn.RootClass) - val treePkl = pickler.treePkl + val treePkl = new TreePickler(pickler) treePkl.pickle(tree :: Nil) treePkl.compactify() if tree.span.exists then diff --git a/compiler/src/dotty/tools/dotc/transform/Pickler.scala b/compiler/src/dotty/tools/dotc/transform/Pickler.scala index 2faf450335dd..cd2a6f33dc6f 100644 --- a/compiler/src/dotty/tools/dotc/transform/Pickler.scala +++ b/compiler/src/dotty/tools/dotc/transform/Pickler.scala @@ -68,7 +68,7 @@ class Pickler extends Phase { if ctx.settings.YtestPickler.value then beforePickling(cls) = tree.show picklers(cls) = pickler - val treePkl = pickler.treePkl + val treePkl = new TreePickler(pickler) treePkl.pickle(tree :: Nil) val positionWarnings = new mutable.ListBuffer[String]() val pickledF = inContext(ctx.fresh) {