SI-6374 Reflection now works for anns with enum fields

Enum members are static and, therefore, they need to be looked up in
classSymbol(<enum>).companionModule, rather than in classSymbol(<enum>).

1 files changed, 4 insertions, 2 deletions

diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 8ea371f2d2..0d9e90d3a6 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -148,8 +148,10 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { thisUnive
       object AnnotationClass { def unapply(x: jClass[_]) = x.isAnnotation }
 
       object ConstantArg {
-        def enumToSymbol(enum: Enum[_]): Symbol =
-          classToScala(enum.getClass).typeSignature.declaration(enum.name: TermName)
+        def enumToSymbol(enum: Enum[_]): Symbol = {
+          val staticPartOfEnum = classToScala(enum.getClass).companionSymbol
+          staticPartOfEnum.typeSignature.declaration(enum.name: TermName)
+        }
 
         def unapply(schemaAndValue: (jClass[_], Any)): Option[Any] = schemaAndValue match {
           case (StringClass | PrimitiveClass(), value) => Some(value)