Move inline β-reduction after Pickler

Author: nicolasstucki

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

@@ -39,12 +39,12 @@ class Compiler {
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new PostTyper) ::          // Additional checks and cleanups after type checking
     List(new sbt.ExtractAPI) ::     // Sends a representation of the API of classes to sbt via callbacks
-    List(new InlineCalls) ::        // β-reduce inline calls
     Nil
 
   /** Phases dealing with TASTY tree pickling and unpickling */
   protected def picklerPhases: List[List[Phase]] =
     List(new Pickler) ::            // Generate TASTY info
+    List(new InlineCalls) ::        // β-reduce inline calls
     List(new ReifyQuotes) ::        // Turn quoted trees into explicit run-time data structures
     Nil
 

compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

@@ -2,6 +2,7 @@ package dotty.tools.dotc.decompiler
 
 import dotty.tools.dotc.fromtasty._
 import dotty.tools.dotc.core.Phases.Phase
+import dotty.tools.dotc.transform.InlineCalls
 
 /** Compiler from tasty to user readable high text representation
  *  of the compiled scala code.
@@ -14,7 +15,10 @@ class TASTYDecompiler extends TASTYCompiler {
     List(new ReadTastyTreesFromClasses) :: // Load classes from tasty
     Nil
 
-  override protected def picklerPhases: List[List[Phase]] = Nil
+  override protected def picklerPhases: List[List[Phase]] =
+    List(new InlineCalls) :: // TODO should we really inline for the decompiler?
+    Nil
+
   override protected def transformPhases: List[List[Phase]] = Nil
 
   override protected def backendPhases: List[List[Phase]] =