Support ConstantAnnotation when extracting literal annotation arguments

src/reflect/scala/reflect/internal/AnnotationInfos.scala

@@ -274,7 +274,7 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
     def stringArg(index: Int)  = constantAtIndex(index) map (_.stringValue)
     def intArg(index: Int)     = constantAtIndex(index) map (_.intValue)
     def booleanArg(index: Int) = constantAtIndex(index) map (_.booleanValue)
-    def symbolArg(index: Int) = argAtIndex(index) collect {
+    def symbolArg(index: Int) = argAtIndex(args, index) collect {
       case Apply(fun, Literal(str) :: Nil) if fun.symbol == definitions.Symbol_apply =>
         newTermName(str.stringValue)
     }
@@ -283,10 +283,14 @@ trait AnnotationInfos extends api.Annotations { self: SymbolTable =>
     // expression, there is a fair chance they will turn up here not as
     // Literal(const) but some arbitrary AST.
     def constantAtIndex(index: Int): Option[Constant] =
-      argAtIndex(index) collect { case Literal(x) => x }
-
-    def argAtIndex(index: Int): Option[Tree] =
-      if (index < args.size) Some(args(index)) else None
+      if (args.nonEmpty) argAtIndex(args, index) collect {
+        case Literal(x) => x
+      } else if (assocs.nonEmpty) argAtIndex(assocs, index) collect {
+        case (_, LiteralAnnotArg(const)) => const
+      } else None
+
+    def argAtIndex[T](l: List[T], index: Int): Option[T] =
+      if (index < l.size) Some(l(index)) else None
 
     def transformArgs(f: List[Tree] => List[Tree]): AnnotationInfo =
       new CompleteAnnotationInfo(atp, f(args), assocs)

test/files/run/constAnnArgs.check

@@ -0,0 +1,23 @@
+
+scala> @deprecated(message = "x", since = "y") def f = 1; f
+                                                          ^
+       warning: method f is deprecated (since y): x
+def f: Int
+val res0: Int = 1
+
+scala> :pa -raw << JUMP!
+// Entering paste mode (JUMP! to finish)
+
+package scala { class deprecated(message: String = "", since: String = "") extends scala.annotation.ConstantAnnotation }
+JUMP!
+
+// Exiting paste mode, now interpreting.
+
+
+scala> @deprecated(message = "x", since = "y") def g = 1; g
+                                                          ^
+       warning: method g is deprecated (since y): x
+def g: Int
+val res1: Int = 1
+
+scala> :quit

test/files/run/constAnnArgs.scala

@@ -0,0 +1,12 @@
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  override def extraSettings = "-deprecation"
+  def code =
+    """@deprecated(message = "x", since = "y") def f = 1; f
+      |:pa -raw << JUMP!
+      |package scala { class deprecated(message: String = "", since: String = "") extends scala.annotation.ConstantAnnotation }
+      |JUMP!
+      |@deprecated(message = "x", since = "y") def g = 1; g
+      |""".stripMargin
+}