Check if already has Deprecated, also on module

scala · Jul 2, 2023 · 54ebd41 · 54ebd41
1 parent 94af990
commit 54ebd41
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 14 deletions.
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -825,8 +825,9 @@ abstract class ClassfileParser(reader: ReusableInstance[ReusableDataReader]) {
 
         case tpnme.DeprecatedATTR =>
           in.skip(attrLen)
-          sym.addAnnotation(JavaDeprecatedAttr)
-          if (sym == clazz)
+          if (!sym.hasAnnotation(JavaDeprecatedAttr))
+            sym.addAnnotation(JavaDeprecatedAttr)
+          if (sym == clazz && !staticModule.hasAnnotation(JavaDeprecatedAttr))
             staticModule.addAnnotation(JavaDeprecatedAttr)
 
         case tpnme.ConstantValueATTR =>
@@ -1509,13 +1510,21 @@ abstract class ClassfileParser(reader: ReusableInstance[ReusableDataReader]) {
 
   // Append annotation. For Java deprecation, prefer an annotation with values (since, etc).
   private def addUniqueAnnotation(symbol: Symbol, annot: AnnotationInfo): symbol.type =
-    if (annot.atp.typeSymbol == JavaDeprecatedAttr && symbol.hasAnnotation(JavaDeprecatedAttr))
-      if (List(0, 1).exists(annot.constantAtIndex(_).isDefined))
-        symbol.setAnnotations {
-          def drop(cur: AnnotationInfo): Boolean = cur.atp.typeSymbol == JavaDeprecatedAttr
-          symbol.annotations.foldRight(annot :: Nil)((a, all) => if (drop(a)) all else a :: all)
-        }
-      else symbol
+    if (annot.atp.typeSymbol == JavaDeprecatedAttr) {
+      def ensureDepr(sym: Symbol): sym.type = {
+        if (sym.hasAnnotation(JavaDeprecatedAttr))
+          if (List(0, 1).exists(annot.constantAtIndex(_).isDefined))
+            sym.setAnnotations {
+              def drop(cur: AnnotationInfo): Boolean = cur.atp.typeSymbol == JavaDeprecatedAttr
+              sym.annotations.foldRight(annot :: Nil)((a, all) => if (drop(a)) all else a :: all)
+            }
+          else sym
+        else sym.addAnnotation(annot)
+      }
+      if (symbol == clazz)
+        ensureDepr(staticModule)
+      ensureDepr(symbol)
+    }
     else symbol.addAnnotation(annot)
 }
 object ClassfileParser {

diff --git a/test/files/run/t12799.check b/test/files/run/t12799.check
@@ -2,8 +2,16 @@ Test_2.scala:7: warning: class B in package example is deprecated (since 1.0): b
   val deprecatedMethod = classOf[B].getMethod("a")
                                 ^
 Test_2.scala:9: warning: method a in trait A is deprecated
-  new B().a
-          ^
+  println(new B().a)
+                  ^
 Test_2.scala:9: warning: class B in package example is deprecated (since 1.0): beeless
-  new B().a
-      ^
+  println(new B().a)
+              ^
+Test_2.scala:10: warning: method answer in class C is deprecated (since beginning)
+  println(C.answer())
+            ^
+Test_2.scala:10: warning: class C in package example is deprecated (since you like it)
+  println(C.answer())
+          ^
+a
+42
diff --git a/test/files/run/t12799/C.java b/test/files/run/t12799/C.java
@@ -0,0 +1,11 @@
+
+package example;
+
+@Deprecated(since="you like it")
+public class C {
+
+    @Deprecated(since="beginning")
+    public static int answer() {
+        return 42;
+    }
+}
diff --git a/test/files/run/t12799/Test_2.scala b/test/files/run/t12799/Test_2.scala
@@ -6,6 +6,7 @@ import example._
 object Test extends App {
   val deprecatedMethod = classOf[B].getMethod("a")
   assert(deprecatedMethod.isAnnotationPresent(classOf[Deprecated]))
-  new B().a
+  println(new B().a)
+  println(C.answer())
 }
 //java.lang.annotation.AnnotationFormatError: Duplicate annotation for class: interface java.lang.Deprecated: @java.lang.Deprecated(forRemoval=false, since="")