Use unpickler to get pickled tasty directly

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -609,33 +609,18 @@ object Symbols {
       * This will force the info of the class.
       */
     def tree(implicit ctx: Context): tpd.Tree /* tpd.PackageDef | tpd.TypeDef | tpd.EmptyTree */ = {
-      load()
-      myTree
-    }
-
-    /** If this is either:
-      *  - a top-level class loaded from TASTY with `-tasty`
-      * then return the bytes of the tasty.
-      */
-    def pickled(implicit ctx: Context): Array[Byte] = {
-      load()
-      myTasty
-    }
-
-    private def load()(implicit ctx: Context): Unit = {
       denot.info
       // TODO: Consider storing this tree like we store lazy trees for inline functions
       if (unpickler != null && !denot.isAbsent) {
         assert(myTree.isEmpty)
         val body = unpickler.body(ctx.addMode(Mode.ReadPositions))
         myTree = body.headOption.getOrElse(tpd.EmptyTree)
-        if (ctx.settings.tasty.value)
-          myTasty = unpickler.unpickler.bytes
-        unpickler = null
+        if (!ctx.settings.tasty.value)
+          unpickler = null
       }
+      myTree
     }
     private[this] var myTree: tpd.Tree /* tpd.PackageDef | tpd.TypeDef | tpd.EmptyTree */ = tpd.EmptyTree
-    private[this] var myTasty: Array[Byte] = _
     private[dotc] var unpickler: tasty.DottyUnpickler = _
 
     private[dotc] def registerTree(tree: tpd.TypeDef)(implicit ctx: Context): Unit = {

compiler/src/dotty/tools/dotc/fromtasty/ReadTastyTreesFromClasses.scala

@@ -28,7 +28,8 @@ class ReadTastyTreesFromClasses extends FrontEnd {
             else {
               val unit = CompilationUnit.mkCompilationUnit(clsd, unpickled, forceTrees = true)
               val cls = clsd.symbol.asClass
-              unit.pickled += (cls -> cls.pickled)
+              unit.pickled += (cls -> cls.unpickler.unpickler.bytes)
+              cls.unpickler = null
               Some(unit)
             }
         }