8169629: Annotations with lambda expressions cause AnnotationFormatError

Reviewed-by: jfranck

Author: jddarcy

src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -370,6 +370,8 @@ private Boolean equalsImpl(Object proxy, Object o) {
         if (!type.isInstance(o))
             return false;
         for (Method memberMethod : getMemberMethods()) {
+            if (memberMethod.isSynthetic())
+                continue;
             String member = memberMethod.getName();
             Object ourValue = memberValues.get(member);
             Object hisValue = null;
@@ -491,6 +493,17 @@ private void validateAnnotationMethods(Method[] memberMethods) {
          */
         boolean valid = true;
         for(Method method : memberMethods) {
+            int modifiers = method.getModifiers();
+            // Skip over methods that may be a static initializer or
+            // similar construct. A static initializer may be used for
+            // purposes such as initializing a lambda stored in an
+            // interface field.
+            if (method.isSynthetic() &&
+                (modifiers & (Modifier.STATIC | Modifier.PRIVATE)) != 0 &&
+                method.getParameterCount() == 0) {
+                continue;
+            }
+
             /*
              * "By virtue of the AnnotationTypeElementDeclaration
              * production, a method declaration in an annotation type
@@ -501,7 +514,7 @@ private void validateAnnotationMethods(Method[] memberMethods) {
              * production, a method declaration in an annotation type
              * declaration cannot be default or static."
              */
-            if (method.getModifiers() != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
+            if (modifiers != (Modifier.PUBLIC | Modifier.ABSTRACT) ||
                 method.isDefault() ||
                 method.getParameterCount() != 0 ||
                 method.getExceptionTypes().length != 0) {

test/jdk/java/lang/annotation/EqualityTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,12 @@
 
 /*
  * @test
- * @bug 8071859
+ * @bug 8071859 8169629
  * @summary Check annotation equality behavior against the invocation handler
+ * @compile --release 8 EqualityTest.java
+ * @run main EqualityTest
+ * @compile EqualityTest.java
+ * @run main EqualityTest
  */
 
 import java.lang.annotation.*;
@@ -40,16 +44,22 @@ public static void main(String... args) throws Exception {
         testEquality(annotation, handler,    false);
         testEquality(annotation, annotation, true);
         testEquality(handler,    handler,    true);
+        testEquality(annotation, AnnotationHost.class.getAnnotation(TestAnnotation.class), true);
     }
 
     private static void testEquality(Object a, Object b, boolean expected) {
         boolean result = a.equals(b);
         if (result != b.equals(a) || result != expected)
             throw new RuntimeException("Unexpected result");
     }
+
+    @TestAnnotation
+    private static class AnnotationHost {}
 }
 
 @Retention(RetentionPolicy.RUNTIME)
 @interface TestAnnotation {
+    // Trigger creation of synthetic method to initialize r.
+    public static final Runnable r = () -> {};
 }