Skip to content

Commit d8d38be

Browse files
committed
Do not overide phases directly
1 parent 71d8c78 commit d8d38be

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

compiler/src/dotty/tools/dotc/quoted/ExprCompiler.scala

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import dotty.tools.dotc.core.StdNames.nme
1313
import dotty.tools.dotc.core.Symbols.defn
1414
import dotty.tools.dotc.core.Types.ExprType
1515
import dotty.tools.dotc.core.quoted.PickledQuotes
16-
import dotty.tools.dotc.transform.Pickler
16+
import dotty.tools.dotc.transform.ReifyQuotes
1717
import dotty.tools.dotc.typer.FrontEnd
1818
import dotty.tools.dotc.util.Positions.Position
1919
import dotty.tools.dotc.util.SourceFile
@@ -33,15 +33,14 @@ class ExprCompiler(directory: VirtualDirectory) extends Compiler {
3333
override def outputDir(implicit ctx: Context) = directory
3434
}
3535

36-
override def phases: List[List[Phase]] = {
37-
val backendPhases = super.phases.dropWhile {
38-
case List(_: Pickler) => false
39-
case _ => true
40-
}.tail
36+
override protected def frontendPhases: List[List[Phase]] =
37+
List(List(new ExprFrontend(putInClass = true)))
4138

42-
List(new ExprFrontend(putInClass = true)) ::
43-
Phases.replace(classOf[GenBCode], _ => new ExprGenBCode :: Nil, backendPhases)
44-
}
39+
override protected def picklerPhases: List[List[Phase]] =
40+
List(List(new ReifyQuotes))
41+
42+
override protected def backendPhases: List[List[Phase]] =
43+
List(List(new ExprGenBCode))
4544

4645
override def newRun(implicit ctx: Context): ExprRun = {
4746
reset()

0 commit comments

Comments
 (0)