Merge pull request #10510 from lrytz/beanNilaryOverrideFix

scala · Aug 30, 2023 · f7e30a6 · f7e30a6
2 parents 9bf2653 + 9fb86b9
commit f7e30a6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/library/scala/beans/BeanProperty.scala b/src/library/scala/beans/BeanProperty.scala
@@ -12,6 +12,8 @@
 
 package scala.beans
 
+import scala.annotation.meta.{beanGetter, beanSetter, field}
+
 /** When attached to a field, this annotation adds a setter and a getter
  *  method following the Java Bean convention. For example:
  *  {{{
@@ -26,6 +28,6 @@ package scala.beans
  *  For fields of type `Boolean`, if you need a getter named `isStatus`,
  *  use the `scala.beans.BooleanBeanProperty` annotation instead.
  */
-@scala.annotation.meta.field
+@field @beanGetter @beanSetter
 @deprecatedInheritance("Scheduled for being final in the future", "2.13.0")
 class BeanProperty extends scala.annotation.StaticAnnotation
diff --git a/src/library/scala/beans/BooleanBeanProperty.scala b/src/library/scala/beans/BooleanBeanProperty.scala
@@ -12,10 +12,12 @@
 
 package scala.beans
 
+import scala.annotation.meta.{beanGetter, beanSetter, field}
+
 /** This annotation has the same functionality as
  *  `scala.beans.BeanProperty`, but the generated Bean getter will be
  *  named `isFieldName` instead of `getFieldName`.
  */
-@scala.annotation.meta.field
+@field @beanGetter @beanSetter
 @deprecatedInheritance("Scheduled for being final in the future", "2.13.0")
 class BooleanBeanProperty extends scala.annotation.StaticAnnotation
diff --git a/src/reflect/scala/reflect/internal/AnnotationInfos.scala b/src/reflect/scala/reflect/internal/AnnotationInfos.scala
@@ -157,8 +157,9 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
    *  definitions) have to be lazy (#1782)
    */
   class LazyAnnotationInfo(lazyInfo: => AnnotationInfo) extends AnnotationInfo {
-    private[this] var forced = false
-    private lazy val forcedInfo = try lazyInfo finally forced = true
+    private[this] var _forced = false
+    protected def forced = _forced
+    private lazy val forcedInfo = try lazyInfo finally _forced = true
 
     def atp: Type                               = forcedInfo.atp
     def args: List[Tree]                        = forcedInfo.args
@@ -167,16 +168,17 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
     def setOriginal(t: Tree): this.type         = { forcedInfo.setOriginal(t); this }
 
     // We should always be able to print things without forcing them.
-    override def toString = if (forced) forcedInfo.toString else "@<?>"
+    override def toString = if (_forced) forcedInfo.toString else "@<?>"
 
-    override def pos: Position = if (forced) forcedInfo.pos else NoPosition
+    override def pos: Position = if (_forced) forcedInfo.pos else NoPosition
 
     override def completeInfo(): Unit = forcedInfo
   }
 
   final class ExtraLazyAnnotationInfo(sym: => Symbol, lazyInfo: => AnnotationInfo) extends LazyAnnotationInfo(lazyInfo) {
     private[this] lazy val typeSymbol = sym
-    override def symbol: Symbol = typeSymbol
+    // If `forced` to UnmappableAnnotation, ensure to return NoSymbol, otherwise `ann.matches(annCls)` can be incorrect
+    override def symbol: Symbol = if (forced) super.symbol else typeSymbol
   }
 
   /** Typed information about an annotation. It can be attached to either

diff --git a/test/files/run/reify_ann5.check b/test/files/run/reify_ann5.check
@@ -1,6 +1,6 @@
 {
   class C extends AnyRef {
-    @new inline @beanGetter() @new BeanProperty() <paramaccessor> val x: Int = _;
+    @new BeanProperty() @new inline @beanGetter() @new BeanProperty() <paramaccessor> val x: Int = _;
     def <init>(x: Int) = {
       super.<init>();
       ()
@@ -10,13 +10,13 @@
 }
 {
   class C extends AnyRef {
-    @scala.beans.BeanProperty <paramaccessor> private[this] val x: Int = _;
+    @scala.beans.BeanProperty @scala.beans.BeanProperty <paramaccessor> private[this] val x: Int = _;
     <stable> <accessor> <paramaccessor> def x: Int = C.this.x;
     def <init>(x: Int): C = {
       C.super.<init>();
       ()
     };
-    @inline @scala.annotation.meta.beanGetter @<notype> def getX(): Int = C.this.x
+    @scala.beans.BeanProperty @inline @scala.annotation.meta.beanGetter @scala.beans.BeanProperty def getX(): Int = C.this.x
   };
   ()
 }