Merge pull request #12517 from dotty-staging/fix-#12471

liufengyun · web-flow · commit d2dd0832fec8 · 2021-05-19T19:31:25.000+02:00
Check level of Type.of Quotes parameter
diff --git a/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala b/compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala
@@ -124,14 +124,15 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       val targs2 = targs.map(targ => TypeTree(healTypeOfTerm(quote.fun.srcPos)(targ.tpe)))
       cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, targs2), body2 :: Nil)
     else
+      val quotes = quote.args.mapConserve(transform)
       body.tpe match
         case tp @ TypeRef(x: TermRef, _) if tp.symbol == defn.QuotedType_splice =>
           // Optimization: `quoted.Type.of[x.Underlying](quotes)`  -->  `x`
           ref(x)
         case _ =>
           // `quoted.Type.of[<body>](quotes)`  --> `quoted.Type.of[<body2>](quotes)`
           val TypeApply(fun, _) = quote.fun
-          cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, body2 :: Nil), quote.args)
+          cpy.Apply(quote)(cpy.TypeApply(quote.fun)(fun, body2 :: Nil), quotes)
   }
 
   /** Transform splice
diff --git a/tests/neg-macros/i12471.scala b/tests/neg-macros/i12471.scala
@@ -0,0 +1,7 @@
+import scala.quoted.*
+
+def impl1[A](using t: Type[A])(using q: Quotes) =
+  '{ Type.of[A] ; ??? } // error
+
+def impl2[A](using t: Type[A])(using q: Quotes) =
+  '{ Type.of[A](using q) ; ??? } // error
