Simplify quoted type transformation in CrossStageSafety

nicolasstucki · nicolasstucki · commit 3097f490dc3e · 2023-05-01T11:28:55.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala b/compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala
@@ -52,7 +52,10 @@ class CrossStageSafety extends TreeMapWithStages {
       transform(tree)(using ctx.withSource(tree.source))
     else if !inQuoteOrSpliceScope then
       checkAnnotations(tree)
-      super.transform(tree)
+      tree match
+        case tree @ QuotedTypeOf(quotedTree) =>
+          transformQuotedType(quotedTree, tree)
+        case _ => super.transform(tree)
     else tree match {
       case _: TypeTree =>
         val tp1 = transformTypeAnnotationSplices(tree.tpe)
@@ -92,6 +95,8 @@ class CrossStageSafety extends TreeMapWithStages {
       case tree: TypeDef if tree.symbol.is(Case) && level > 0 =>
         report.error(reporting.CaseClassInInlinedCode(tree), tree)
         super.transform(tree)
+      case tree @ QuotedTypeOf(quotedTree) =>
+        transformQuotedType(quotedTree, tree)
       case tree @ SplicedType(splicedTree) =>
         transformSpliceType(splicedTree, tree)
       case _ =>
@@ -109,7 +114,7 @@ class CrossStageSafety extends TreeMapWithStages {
     cpy.Quote(quote)(transformedBody).withBodyType(bodyType1)
   }
 
-  override protected def transformQuotedType(body: Tree, quote: Apply)(using Context): Tree = {
+  private def transformQuotedType(body: Tree, quote: Apply)(using Context): Tree = {
     if (ctx.property(InAnnotation).isDefined)
       report.error("Cannot have a quote in an annotation", quote.srcPos)
     body.tpe match
diff --git a/compiler/src/dotty/tools/dotc/staging/TreeMapWithStages.scala b/compiler/src/dotty/tools/dotc/staging/TreeMapWithStages.scala
@@ -22,14 +22,6 @@ abstract class TreeMapWithStages extends TreeMapWithImplicits {
   protected def transformQuote(body: Tree, quote: Quote)(using Context): Tree =
     cpy.Quote(quote)(body)
 
-  /** Transform the quote `quote` which contains the quoted `body`.
-   *
-   *  - `quoted.Type.of[<body0>](quotes)`  --> `quoted.Type.of[<body>](quotes)`
-   */
-  protected def transformQuotedType(body: Tree, quote: Apply)(using Context): Tree =
-    val TypeApply(fun, _) = quote.fun: @unchecked
-    cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, body :: Nil), quote.args)
-
   /** Transform the expression splice `splice` which contains the spliced `body`. */
   protected def transformSplice(body: Tree, splice: Splice)(using Context): Tree
 
@@ -43,8 +35,6 @@ abstract class TreeMapWithStages extends TreeMapWithImplicits {
       }
 
       tree match {
-        case tree @ QuotedTypeOf(quotedTree) =>
-          transformQuotedType(quotedTree, tree)
         case tree @ Quote(quotedTree) =>
           dropEmptyBlocks(quotedTree) match {
             case Splice(t) =>
