Move loadCompilationUnit out of FromTasty

Author: nicolasstucki

compiler/src/dotty/tools/dotc/CompilationUnit.scala

@@ -1,10 +1,11 @@
 package dotty.tools
 package dotc
 
-import dotty.tools.dotc.core.Types.Type
-import dotty.tools.dotc.core.tasty.{TastyUnpickler, TastyBuffer, TastyPickler}
 import util.SourceFile
 import ast.{tpd, untpd}
+import dotty.tools.dotc.ast.tpd.{ Tree, TreeTraverser }
+import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.SymDenotations.ClassDenotation
 import dotty.tools.dotc.core.Symbols._
 
 class CompilationUnit(val source: SourceFile) {
@@ -20,3 +21,19 @@ class CompilationUnit(val source: SourceFile) {
   /** Pickled TASTY binaries, indexed by class. */
   var pickled: Map[ClassSymbol, Array[Byte]] = Map()
 }
+
+object CompilationUnit {
+
+  /** Make a compilation unit for top class `clsd` with the contends of the `unpickled` */
+  def mkCompilationUnit(clsd: ClassDenotation, unpickled: Tree)(implicit ctx: Context): CompilationUnit = {
+    val unit1 = new CompilationUnit(new SourceFile(clsd.symbol.sourceFile, Seq()))
+    unit1.tpdTree = unpickled
+    force.traverse(unit1.tpdTree)
+    unit1
+  }
+
+  /** Force the tree to be loaded */
+  private object force extends TreeTraverser {
+    def traverse(tree: Tree)(implicit ctx: Context): Unit = traverseChildren(tree)
+  }
+}

compiler/src/dotty/tools/dotc/FromTasty.scala

@@ -60,10 +60,6 @@ object FromTasty extends Driver {
     override def toString = s"class file $className"
   }
 
-  object force extends TreeTraverser {
-    def traverse(tree: Tree)(implicit ctx: Context): Unit = traverseChildren(tree)
-  }
-
   class ReadTastyTreesFromClasses extends FrontEnd {
 
     override def isTyper = false
@@ -85,7 +81,7 @@ object FromTasty extends Driver {
               case info: ClassfileLoader =>
                 info.load(clsd)
                 val unpickled = clsd.symbol.asClass.tree
-                if (unpickled != null) mkUnit(clsd, unpickled)
+                if (unpickled != null) CompilationUnit.mkCompilationUnit(clsd, unpickled)
                 else cannotUnpickle(s"its class file ${info.classfile} does not have a TASTY attribute")
               case info =>
                 cannotUnpickle(s"its info of type ${info.getClass} is not a ClassfileLoader")
@@ -96,21 +92,4 @@ object FromTasty extends Driver {
         }
     }
   }
-
-  def loadCompilationUnit(clsd: ClassDenotation)(implicit ctx: Context): Option[CompilationUnit] = {
-    assert(ctx.settings.XlinkOptimise.value)
-    val tree = clsd.symbol.asClass.unitTree
-    if (tree.isEmpty) None
-    else {
-      ctx.log("Loading compilation unit for: " + clsd)
-      Some(mkUnit(clsd, tree))
-    }
-  }
-
-  private def mkUnit(clsd: ClassDenotation, unpickled: Tree)(implicit ctx: Context): CompilationUnit = {
-    val unit1 = new CompilationUnit(new SourceFile(clsd.symbol.sourceFile, Seq()))
-    unit1.tpdTree = unpickled
-    force.traverse(unit1.tpdTree)
-    unit1
-  }
 }

compiler/src/dotty/tools/dotc/transform/LinkAll.scala

@@ -16,6 +16,7 @@ import dotty.tools.dotc.transform.TreeTransforms._
  */
 class LinkAll extends MiniPhaseTransform {
   import tpd._
+  import LinkAll._
 
   override def phaseName = "linkAll"
 
@@ -31,7 +32,7 @@ class LinkAll extends MiniPhaseTransform {
     else {
       val accum = new ClassesToLoadAccumulator
       val classesToLoad = unprocessed.foldLeft(Set.empty[ClassDenotation])((acc, unit) => accum.apply(acc, unit.tpdTree)) -- loadedClasses
-      val loadedUnits = classesToLoad.flatMap(cls => FromTasty.loadCompilationUnit(cls))
+      val loadedUnits = classesToLoad.flatMap(cls => loadCompilationUnit(cls))
       allUnits(processed ++ unprocessed, loadedUnits, loadedClasses ++ classesToLoad)
     }
   }
@@ -61,3 +62,17 @@ class LinkAll extends MiniPhaseTransform {
     }
   }
 }
+
+object LinkAll {
+
+  private[LinkAll] def loadCompilationUnit(clsd: ClassDenotation)(implicit ctx: Context): Option[CompilationUnit] = {
+    assert(ctx.settings.XlinkOptimise.value)
+    val tree = clsd.symbol.asClass.unitTree
+    if (tree.isEmpty) None
+    else {
+      ctx.log("Loading compilation unit for: " + clsd)
+      Some(CompilationUnit.mkCompilationUnit(clsd, tree))
+    }
+  }
+
+}