Skip to content

Commit d70cd33

Browse files
committed
Extract quote reification from Staging
1 parent 845fd59 commit d70cd33

File tree

6 files changed

+470
-174
lines changed

6 files changed

+470
-174
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class Compiler {
4646
/** Phases dealing with TASTY tree pickling and unpickling */
4747
protected def picklerPhases: List[List[Phase]] =
4848
List(new Pickler) :: // Generate TASTY info
49-
List(new Staging) :: // Expand macros and turn quoted trees into explicit run-time data structures
49+
List(new Staging) :: // Check quotation levels (while healing types) and expand macros
50+
List(new ReifyQuotes) :: // Turn quoted trees into explicit run-time data structures
5051
Nil
5152

5253
/** Phases dealing with the transformation from pickled trees to backend trees */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class TreeCleaner extends tpd.TreeMap {
2121

2222
override def transform(tree: Tree)(implicit ctx: Context): Tree = {
2323
val tree0 = tree match {
24-
case TypeDef(_, TypeBoundsTree(lo, hi)) if lo == hi =>
24+
case TypeDef(_, TypeBoundsTree(lo, hi)) if lo.tpe =:= hi.tpe =>
2525
aliasesSyms = tree.symbol :: aliasesSyms
2626
aliasesTypes = lo.tpe :: aliasesTypes
2727
aliases(tree.symbol) = ref(lo.tpe.typeSymbol)

0 commit comments

Comments
 (0)