Skip to content

Commit 7ff4e80

Browse files
committed
Move inline β-reduction after Pickler
1 parent 746fdd7 commit 7ff4e80

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ class Compiler {
3939
List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
4040
List(new PostTyper) :: // Additional checks and cleanups after type checking
4141
List(new sbt.ExtractAPI) :: // Sends a representation of the API of classes to sbt via callbacks
42-
List(new InlineCalls) :: // β-reduce inline calls
4342
Nil
4443

4544
/** Phases dealing with TASTY tree pickling and unpickling */
4645
protected def picklerPhases: List[List[Phase]] =
4746
List(new Pickler) :: // Generate TASTY info
47+
List(new InlineCalls) :: // β-reduce inline calls
4848
List(new ReifyQuotes) :: // Turn quoted trees into explicit run-time data structures
4949
Nil
5050

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dotty.tools.dotc.decompiler
22

33
import dotty.tools.dotc.fromtasty._
44
import dotty.tools.dotc.core.Phases.Phase
5+
import dotty.tools.dotc.transform.InlineCalls
56

67
/** Compiler from tasty to user readable high text representation
78
* of the compiled scala code.
@@ -14,7 +15,10 @@ class TASTYDecompiler extends TASTYCompiler {
1415
List(new ReadTastyTreesFromClasses) :: // Load classes from tasty
1516
Nil
1617

17-
override protected def picklerPhases: List[List[Phase]] = Nil
18+
override protected def picklerPhases: List[List[Phase]] =
19+
List(new InlineCalls) ::
20+
Nil
21+
1822
override protected def transformPhases: List[List[Phase]] = Nil
1923

2024
override protected def backendPhases: List[List[Phase]] =

0 commit comments

Comments
 (0)