Only retain @field-bearing annotations on fields

dwijnand · dwijnand · commit aa1bc2453dfc · 2022-12-12T17:07:22.000Z
diff --git a/compiler/src/dotty/tools/dotc/transform/Memoize.scala b/compiler/src/dotty/tools/dotc/transform/Memoize.scala
@@ -122,7 +122,7 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase =>
       denot match {
         case fieldDenot: SymDenotation if sym.annotations.nonEmpty =>
           val cpy = fieldDenot.copySymDenotation()
-          cpy.annotations = sym.annotations
+          cpy.annotations = atPhase(typerPhase)(sym.annotationsCarrying(defn.FieldMetaAnnot))
           cpy.installAfter(thisPhase)
         case _ => ()
       }
diff --git a/tests/run/i12492.check b/tests/run/i12492.check
@@ -1,7 +1,7 @@
 inspecting field fieldName1 @MyColumnBase
 inspecting field fieldName2 @MyColumnBase
-inspecting field getterName1 @MyColumnBase
-inspecting field getterName2 @MyColumnBase
+inspecting field getterName1
+inspecting field getterName2
 inspecting method fieldName1
 inspecting method fieldName2
 inspecting method getterName1 @MyColumnBase
diff --git a/tests/run/i15318.check b/tests/run/i15318.check
@@ -1,5 +1,5 @@
-inspecting field value @JsonProperty
-inspecting field value2 @JsonProperty
+inspecting field value
+inspecting field value2
 inspecting method getValue @JsonProperty
 inspecting method getValue2 @JsonProperty
 inspecting method setValue

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ class Memoize extends MiniPhase with IdentityDenotTransformer { thisPhase =>`
`122`	`122`	`denot match {`
`123`	`123`	`case fieldDenot: SymDenotation if sym.annotations.nonEmpty =>`
`124`	`124`	`val cpy = fieldDenot.copySymDenotation()`
`125`		`- cpy.annotations = sym.annotations`
	`125`	`+ cpy.annotations = atPhase(typerPhase)(sym.annotationsCarrying(defn.FieldMetaAnnot))`
`126`	`126`	`cpy.installAfter(thisPhase)`
`127`	`127`	`case _ => ()`
`128`	`128`	`}`