filter out TypeAnnotations that have a null annotation

Author: dougxc

src/java.base/share/classes/jdk/internal/vm/VMSupport.java

@@ -468,9 +468,19 @@ private static void encodeMemberValue(DataOutputStream dos, Object value) throws
      * @param dos stream for assembling the byte array
      */
     public static void encodeTypeAnnotations(DataOutputStream dos, TypeAnnotation[] typeAnnotations) throws IOException {
-        writeLength(dos, typeAnnotations.length);
+        int wellFormed = 0;
         for (TypeAnnotation ta : typeAnnotations) {
-            encodeTypeAnnotation(dos, ta);
+            // Ignore not well-formed type annotations like
+            // TypeAnnotationParser.mapTypeAnnotations does
+            if (ta.getAnnotation() != null) {
+                wellFormed++;
+            }
+        }
+        writeLength(dos, wellFormed);
+        for (TypeAnnotation ta : typeAnnotations) {
+            if (ta.getAnnotation() != null) {
+                encodeTypeAnnotation(dos, ta);
+            }
         }
     }
 

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java

@@ -31,6 +31,7 @@
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberTypeChanged.java
  *          TestResolvedJavaType.java
  * @clean jdk.internal.vm.test.AnnotationTestInput$Missing
+ *        jdk.internal.vm.test.AnnotationTestInput$MissingTypeQualifier
  * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberAdded.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java

@@ -31,6 +31,7 @@
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberTypeChanged.java
  *          TestResolvedJavaType.java
  * @clean jdk.internal.vm.test.AnnotationTestInput$Missing
+ *        jdk.internal.vm.test.AnnotationTestInput$MissingTypeQualifier
  * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberAdded.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaRecordComponent.java

@@ -31,6 +31,7 @@
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberTypeChanged.java
  *          TestResolvedJavaType.java
  * @clean jdk.internal.vm.test.AnnotationTestInput$Missing
+ *        jdk.internal.vm.test.AnnotationTestInput$MissingTypeQualifier
  * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberAdded.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java

test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java

@@ -31,6 +31,7 @@
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberAdded.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/MemberTypeChanged.java
  * @clean jdk.internal.vm.test.AnnotationTestInput$Missing
+ *        jdk.internal.vm.test.AnnotationTestInput$MissingTypeQualifier
  * @compile ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberDeleted.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberAdded.java
  *          ../../../../../../../../../../../jdk/jdk/internal/vm/AnnotationEncodingDecoding/alt/MemberTypeChanged.java
@@ -1249,6 +1250,7 @@ private Method findTestMethod(Method apiMethod) {
     @Test
     public void getTypeAnnotationValuesTest() {
         getTypeAnnotationValuesTest(AnnotationTestInput.AnnotatedClass.class);
+        getTypeAnnotationValuesTest(AnnotationTestInput.AnnotatedClass2.class);
         getTypeAnnotationValuesTest(int.class);
         getTypeAnnotationValuesTest(void.class);
         for (Class<?> c : classes) {
@@ -1268,15 +1270,18 @@ private static void getTypeAnnotationValuesTest(Class<?> cls) {
     private static final Method classGetRawTypeAnnotations = lookupMethod(Class.class, "getRawTypeAnnotations");
     private static final Method classGetConstantPool = lookupMethod(Class.class, "getConstantPool");
 
-    private static TypeAnnotation[] getTypeAnnotations(Class<?> c) {
+    private static List<TypeAnnotation> getTypeAnnotations(Class<?> c) {
         byte[] rawAnnotations = invokeMethod(classGetRawTypeAnnotations, c);
         ConstantPool cp = invokeMethod(classGetConstantPool, c);
-        return TypeAnnotationParser.parseTypeAnnotations(rawAnnotations, cp, null, false, c);
+        return Stream.of(TypeAnnotationParser.parseTypeAnnotations(rawAnnotations, cp, null, false, c))
+                .filter(ta -> ta.getAnnotation() != null)
+                .toList();
     }
 
     @Test
     public void getAnnotationValuesTest() {
         getAnnotationValuesTest(AnnotationTestInput.AnnotatedClass.class);
+        getAnnotationValuesTest(AnnotationTestInput.AnnotatedClass2.class);
         getAnnotationValuesTest(int.class);
         getAnnotationValuesTest(void.class);
         for (Class<?> c : classes) {
@@ -1383,11 +1388,11 @@ public static List<AnnotationValue> getAnnotationValuesTest(AnnotatedElement ann
     }
 
     public static void assertTypeAnnotationsEquals(
-            TypeAnnotation[] typeAnnotations,
+            List<TypeAnnotation> typeAnnotations,
             List<TypeAnnotationValue> typeAnnotationValues) throws AssertionError {
-        assertEquals(typeAnnotations.length, typeAnnotationValues.size());
-        for (int i = 0; i < typeAnnotations.length; i++) {
-            TypeAnnotation typeAnnotation = typeAnnotations[i];
+        assertEquals(typeAnnotations.size(), typeAnnotationValues.size());
+        for (int i = 0; i < typeAnnotations.size(); i++) {
+            TypeAnnotation typeAnnotation = typeAnnotations.get(i);
             TypeAnnotationValue typeAnnotationValue = typeAnnotationValues.get(i);
             assertTypeAnnotationEquals(typeAnnotation, typeAnnotationValue);
         }

test/jdk/jdk/internal/vm/AnnotationEncodingDecoding/AnnotationTestInput.java

@@ -30,6 +30,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.lang.reflect.Method;
+import java.util.function.Predicate;
 
 public class AnnotationTestInput {
 
@@ -177,7 +178,9 @@ public static class InheritedName3 extends Super3 {}
     @SuppressWarnings({"rawtypes", "all"})
     public static class AnnotatedClass extends @TypeQualifier Thread implements @TypeQualifier Serializable {}
 
-    public static record AnnotatedRecord(@TypeQualifier @Named("obj1Component Name") String obj1Component, @Missing @NestedAnno("int1 value") int int1Component, @Missing float componentWithMissingAnno) {}
+    public record AnnotatedRecord(@TypeQualifier @Named("obj1Component Name") String obj1Component, @Missing @NestedAnno("int1 value") int int1Component, @Missing float componentWithMissingAnno) {}
+
+    public static abstract class AnnotatedClass2<T> implements Predicate<@MissingTypeQualifier T> {}
 
     @Single(string = "a",
             stringArray = {"a", "b"},
@@ -248,6 +251,12 @@ public static record AnnotatedRecord(@TypeQualifier @Named("obj1Component Name")
         String comment() default "";
     }
 
+    // Define a type-use annotation that is missing at runtime
+    @Target(ElementType.TYPE_USE)
+    @Retention(RetentionPolicy.RUNTIME)
+    @interface MissingTypeQualifier {
+    }
+
     @Retention(RetentionPolicy.RUNTIME)
     public @interface NestedAnno {
         String value();

test/jdk/jdk/internal/vm/AnnotationEncodingDecoding/TestAnnotationEncodingDecoding.java

@@ -27,6 +27,7 @@
  * @modules java.base/jdk.internal.vm
  *          java.base/sun.reflect.annotation
  * @clean jdk.internal.vm.test.AnnotationTestInput$Missing
+ *        jdk.internal.vm.test.AnnotationTestInput$MissingTypeQualifier
  * @compile alt/MemberDeleted.java alt/MemberTypeChanged.java
  * @run testng/othervm
  *      jdk.internal.vm.test.TestAnnotationEncodingDecoding