Make sure memoised accessors keep their meta annotation

Author: dwijnand

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

@@ -55,7 +55,8 @@ class BeanProperties(thisPhase: DenotTransformer):
           a.hasOneOfMetaAnnotation(defn.BeanSetterMetaAnnot) || !a.hasOneOfMetaAnnotation(defn.BeanGetterMetaAnnot)
         }
         meth.addAnnotations(annots)
-        DefDef(meth, (params: List[List[Tree]]) => Assign(ref(valDef.symbol), params.head.head)).withSpan(meth.span)
+        def body(params: List[List[Tree]]): Tree = Assign(ref(valDef.symbol), params.head.head)
+        DefDef(meth, body).withSpan(meth.span)
       }
 
     def prefixedName(prefix: String, valName: Name) =

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

@@ -4,7 +4,7 @@ package transform
 import core._
 import DenotTransformers._
 import Contexts._
-import Phases.phaseOf
+import Phases.*
 import SymDenotations.SymDenotation
 import Denotations._
 import Symbols._
@@ -130,7 +130,7 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase =>
     def removeUnwantedAnnotations(denot: SymDenotation, metaAnnotSym: ClassSymbol): Unit =
       if (sym.annotations.nonEmpty) {
         val cpy = sym.copySymDenotation()
-        cpy.filterAnnotations(_.symbol.hasAnnotation(metaAnnotSym))
+        cpy.filterAnnotations(annot => atPhase(typerPhase)(annot.hasOneOfMetaAnnotation(metaAnnotSym)))
         cpy.installAfter(thisPhase)
       }
 

tests/run/i12492.check

@@ -1,9 +1,13 @@
-inspecting field brandName
-interface MyColumnBase
-inspecting field companyName
-interface MyColumnBase
-inspecting method brandName
-inspecting method companyName
+inspecting field fieldName1 @MyColumnBase
+inspecting field fieldName2 @MyColumnBase
+inspecting field getterName1 @MyColumnBase
+inspecting field getterName2 @MyColumnBase
+inspecting method fieldName1
+inspecting method fieldName2
+inspecting method getterName1 @MyColumnBase
+inspecting method getterName2 @MyColumnBase
 inspecting constructor MyTable
-inspecting param brandName
-inspecting param companyName
+inspecting param fieldName1
+inspecting param fieldName2
+inspecting param getterName1
+inspecting param getterName2

tests/run/i12492/MyTable.scala

@@ -1,10 +1,16 @@
-import scala.annotation.meta.field
+import scala.annotation.meta.*
 
-type MyColumn = MyColumnBase @field
+type FieldColumn = MyColumnBase @field
+type GetterColumn = MyColumnBase @getter
 
 class MyTable(
-  @(MyColumnBase @field)(name="BRAND_NAME")
-  val brandName: String,
-  @MyColumn(name="COMPANY_NAME")
-  val companyName: String,
+  @(MyColumnBase @field)(name="FIELD_NAME1")
+  val fieldName1: String,
+  @FieldColumn(name="FIELD_NAME2")
+  val fieldName2: String,
+
+  @(MyColumnBase @getter)(name="GETTER_NAME1")
+  val getterName1: String,
+  @GetterColumn(name="GETTER_NAME2")
+  val getterName2: String,
 )

tests/run/i12492/Test.scala

@@ -5,22 +5,25 @@ object Test:
 
     for (m <- cls.getDeclaredFields.sortBy(_.getName)) {
       m.setAccessible(true)
-      println(s"inspecting field ${m.getName}")
+      print(s"inspecting field ${m.getName}")
       for a <- m.getAnnotations().sortBy(_.annotationType.toString) do
-        println(a.annotationType)
+        print(s" @${a.annotationType.getName}")
+      println()
     }
 
     for (m <- cls.getDeclaredMethods.sortBy(_.getName)) {
       m.setAccessible(true)
-      println(s"inspecting method ${m.getName}")
+      print(s"inspecting method ${m.getName}")
       for a <- m.getAnnotations().sortBy(_.annotationType.toString) do
-        println(a.annotationType)
+        print(s" @${a.annotationType.getName}")
+      println()
     }
 
     for c <- cls.getDeclaredConstructors.sortBy(_.getName) do
       c.setAccessible(true)
       println(s"inspecting constructor ${c.getName}")
       for p <- c.getParameters.sortBy(_.getName) do
-        println(s"inspecting param ${p.getName}")
+        print(s"inspecting param ${p.getName}")
         for a <- p.getAnnotations.sortBy(_.annotationType.toString) do
-          println(a.annotationType)
+          print(s" @${a.annotationType.getName}")
+        println()

tests/run/i15318.check

@@ -1,7 +1,5 @@
-inspecting field value
-interface JsonProperty
-inspecting method getValue
-interface JsonProperty
+inspecting field value @JsonProperty
+inspecting method getValue @JsonProperty
 inspecting method setValue
 inspecting method value
 inspecting method value_$eq

tests/run/i15318/Test.scala

@@ -5,22 +5,25 @@ object Test:
 
     for (m <- cls.getDeclaredFields.sortBy(_.getName)) {
       m.setAccessible(true)
-      println(s"inspecting field ${m.getName}")
+      print(s"inspecting field ${m.getName}")
       for a <- m.getAnnotations().sortBy(_.annotationType.toString) do
-        println(a.annotationType)
+        print(s" @${a.annotationType.getName}")
+      println()
     }
 
     for (m <- cls.getDeclaredMethods.sortBy(_.getName)) {
       m.setAccessible(true)
-      println(s"inspecting method ${m.getName}")
+      print(s"inspecting method ${m.getName}")
       for a <- m.getAnnotations().sortBy(_.annotationType.toString) do
-        println(a.annotationType)
+        print(s" @${a.annotationType.getName}")
+      println()
     }
 
     for c <- cls.getDeclaredConstructors.sortBy(_.getName) do
       c.setAccessible(true)
       println(s"inspecting constructor ${c.getName}")
       for p <- c.getParameters.sortBy(_.getName) do
-        println(s"inspecting param ${p.getName}")
+        print(s"inspecting param ${p.getName}")
         for a <- p.getAnnotations.sortBy(_.annotationType.toString) do
-          println(a.annotationType)
+          print(s" @${a.annotationType.getName}")
+        println()