Merge pull request #7053 from dotty-staging/fix-#7052

Fix #7052: Transform annotations in ReifyQuotes

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/TreeMapWithImplicits.scala

@@ -62,7 +62,7 @@ class TreeMapWithImplicits extends tpd.TreeMap {
   private def nestedScopeCtx(defs: List[Tree])(implicit ctx: Context): Context = {
     val nestedCtx = ctx.fresh.setNewScope
     defs foreach {
-      case d: DefTree => nestedCtx.enter(d.symbol)
+      case d: DefTree if d.symbol.isOneOf(GivenOrImplicit) => nestedCtx.enter(d.symbol)
       case _ =>
     }
     nestedCtx
@@ -73,7 +73,7 @@ class TreeMapWithImplicits extends tpd.TreeMap {
     new TreeTraverser {
       def traverse(tree: Tree)(implicit ctx: Context): Unit = {
         tree match {
-          case d: DefTree => nestedCtx.enter(d.symbol)
+          case d: DefTree if d.symbol.isOneOf(GivenOrImplicit) => nestedCtx.enter(d.symbol)
           case _ =>
         }
         traverseChildren(tree)

compiler/src/dotty/tools/dotc/transform/PCPCheckAndHeal.scala

@@ -38,6 +38,10 @@ class PCPCheckAndHeal(@constructorOnly ictx: Context) extends TreeMapWithStages(
       transform(tree)(ctx.withSource(tree.source))
     else tree match {
       case tree: DefDef if tree.symbol.is(Inline) && level > 0 => EmptyTree
+      case tree: DefTree =>
+        for (annot <- tree.symbol.annotations)
+          transform(annot.tree) given ctx.withOwner(tree.symbol)
+        checkLevel(super.transform(tree))
       case _ => checkLevel(super.transform(tree))
     }
   }

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -19,7 +19,7 @@ import dotty.tools.dotc.ast.tpd
 import typer.Implicits.SearchFailureType
 
 import scala.collection.mutable
-import dotty.tools.dotc.core.Annotations.Annotation
+import dotty.tools.dotc.core.Annotations._
 import dotty.tools.dotc.core.Names._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.quoted._
@@ -407,6 +407,14 @@ class ReifyQuotes extends MacroTransform {
             // TODO move to FirstTransform to trigger even without quotes
             cpy.DefDef(tree)(rhs = defaultValue(tree.rhs.tpe))
 
+          case tree: DefTree if level >= 1 =>
+            val newAnnotations = tree.symbol.annotations.mapconserve { annot =>
+              val newAnnotTree = transform(annot.tree) given ctx.withOwner(tree.symbol)
+              if (annot.tree == newAnnotTree) annot
+              else ConcreteAnnotation(newAnnotTree)
+            }
+            tree.symbol.annotations = newAnnotations
+            super.transform(tree)
           case _ =>
             super.transform(tree)
         }

tests/neg/i7052.scala

@@ -0,0 +1,7 @@
+import scala.quoted._
+class Test {
+  def foo(str: String) given QuoteContext = '{
+    @deprecated(str, "") // error
+    def bar = ???
+  }
+}

tests/neg/i7052b.scala

@@ -0,0 +1,10 @@
+import scala.quoted._
+class Test {
+  def foo(str: String) given QuoteContext = '{
+    delegate for QuoteContext = ???
+    '{
+      @deprecated(str, "") // error
+      def bar = ???
+    }
+  }
+}

tests/pos/i7052.scala

@@ -0,0 +1,7 @@
+import scala.quoted._
+class Test {
+  def foo(str: Expr[String]) given QuoteContext = '{
+    @deprecated($str, "")
+    def bar = ???
+  }
+}