Update Attribute on CF

biboudis · biboudis · commit 6138923c4880 · 2024-06-06T14:36:11.000+02:00
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
@@ -26,10 +26,7 @@
 package java.lang;
 
 import java.lang.annotation.Annotation;
-import java.lang.classfile.Attributes;
-import java.lang.classfile.ClassFile;
-import java.lang.classfile.ClassModel;
-import java.lang.classfile.MethodModel;
+import java.lang.classfile.*;
 import java.lang.classfile.attribute.*;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
@@ -2311,7 +2308,10 @@ private Method[] filterOutDeconstructorsFromMethods(Method[] in) {
                 throw new RuntimeException(e);
             }
             for (MethodModel mm : cm.methods()) {
-                PatternAttribute pa = mm.findAttribute(Attributes.PATTERN).orElse(null);
+                PatternAttribute pa = null;
+                for (Attribute<?> attribute : mm.attributes()) {
+                    if (attribute instanceof PatternAttribute pap) pa = pap;
+                }
                 isNotPattern.put(mm.methodName().stringValue(), pa == null);
             }
             Method[] ret = Arrays.stream(in).filter(m -> isNotPattern.getOrDefault(m.getName(), true)).toArray(Method[]::new);
@@ -2413,12 +2413,18 @@ private Deconstructor<?>[] getDeclaredDeconstructors0(Class<?>[] params, int whi
             byte[] bytes = is.readAllBytes();
             ClassModel cm = ClassFile.of().parse(bytes);
             for (MethodModel mm : cm.methods()) {
-                PatternAttribute pa = mm.findAttribute(Attributes.PATTERN).orElse(null);
+                PatternAttribute pa = null;
+                for (Attribute<?> attribute : mm.attributes()) {
+                    if (attribute instanceof PatternAttribute pa_) pa = pa_;
+                }
                 if (pa != null) {
                     String descriptorFilter = null;
 
                     // generic signature detection
-                    SignatureAttribute sa = pa.findAttribute(Attributes.SIGNATURE).orElse(null);
+                    SignatureAttribute sa = null;
+                    for (Attribute<?> attribute : pa.attributes()) {
+                        if (attribute instanceof SignatureAttribute sa_) sa = sa_;
+                    }
                     List<String> signatures = List.of();
                     if (sa != null) {
                         signatures = sa.asMethodSignature().arguments().stream().map(a -> a.signatureString()).toList();
@@ -2435,7 +2441,10 @@ private Deconstructor<?>[] getDeclaredDeconstructors0(Class<?>[] params, int whi
                     if ((params.length == 0 || (params.length != 0 && pa.patternTypeSymbol().descriptorString().equals(descriptorFilter))) &&
                         (which == Member.DECLARED || mm.flags().has(AccessFlag.PUBLIC))) {
                         // binding annotations
-                        RuntimeVisibleAnnotationsAttribute rva = mm.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).orElse(null);
+                        RuntimeVisibleAnnotationsAttribute rva = null;
+                        for (Attribute<?> attribute : mm.attributes()) {
+                            if (attribute instanceof RuntimeVisibleAnnotationsAttribute rva_) rva = rva_;
+                        }
                         ByteBuffer assembled_rva = null;
                         if (rva != null) {
                             byte rvaBytes[] = ((BoundAttribute) rva).contents();  // returns the full attribute
@@ -2456,11 +2465,17 @@ private Deconstructor<?>[] getDeclaredDeconstructors0(Class<?>[] params, int whi
 
                         // parameter names
                         var parameterList = pa.patternTypeSymbol().parameterList();
-                        MethodParametersAttribute mp = pa.findAttribute(Attributes.METHOD_PARAMETERS).orElse(null);
+                        MethodParametersAttribute mp = null;
+                        for (Attribute<?> attribute : pa.attributes()) {
+                            if (attribute instanceof MethodParametersAttribute mp_) mp = mp_;
+                        }
                         List<String> parameterNameList = mp.parameters().stream().map(p -> p.name().get().stringValue()).toList();
 
                         // binding annotations
-                        RuntimeVisibleParameterAnnotationsAttribute rvpa = pa.findAttribute(Attributes.RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS).orElse(null);
+                        RuntimeVisibleParameterAnnotationsAttribute rvpa = null;
+                        for (Attribute<?> attribute : pa.attributes()) {
+                            if (attribute instanceof RuntimeVisibleParameterAnnotationsAttribute rvpa_) rvpa = rvpa_;
+                        }
                         ByteBuffer assembled_rvpa = null;
                         if (rvpa != null) {
                             byte rvpaBytes[] = ((BoundAttribute) rvpa).contents();
@@ -2470,7 +2485,10 @@ private Deconstructor<?>[] getDeclaredDeconstructors0(Class<?>[] params, int whi
                         }
 
                         // binding type annotations
-                        RuntimeVisibleTypeAnnotationsAttribute rvta = pa.findAttribute(Attributes.RUNTIME_VISIBLE_TYPE_ANNOTATIONS).orElse(null);
+                        RuntimeVisibleTypeAnnotationsAttribute rvta = null;
+                        for (Attribute<?> attribute : pa.attributes()) {
+                            if (attribute instanceof RuntimeVisibleTypeAnnotationsAttribute rvta_) rvta = rvta_;
+                        }
                         ByteBuffer assembled_rvta = null;
                         if (rvpa != null) {
                             byte rvtaBytes[] = ((BoundAttribute) rvpa).contents();
diff --git a/src/java.base/share/classes/java/lang/classfile/Attributes.java b/src/java.base/share/classes/java/lang/classfile/Attributes.java
@@ -41,6 +41,7 @@
  * <li>{@link #moduleResolution()}
  * <li>{@link #sourceDebugExtension()}
  * <li>{@link #synthetic()}
+ * <li>{@link #pattern()}
  * </ul>
  *
  * The mappers with {@link AttributeStability#CP_REFS CP_REFS} stability are:
@@ -500,4 +501,11 @@ public static AttributeMapper<StackMapTableAttribute> stackMapTable() {
     public static AttributeMapper<SyntheticAttribute> synthetic() {
         return SyntheticMapper.INSTANCE;
     }
+
+    /**
+     * {@return Attribute mapper for the {@code Pattern} attribute}
+     * The mapper permits multiple instances in a given location.
+     * @since 23
+     */
+    public static AttributeMapper<PatternAttribute> pattern() { return PatternMapper.INSTANCE; }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java b/src/java.base/share/classes/jdk/internal/classfile/impl/AbstractAttributeMapper.java
@@ -821,4 +821,25 @@ protected void writeBody(BufWriter buf, SyntheticAttribute attr) {
             // empty
         }
     }
+
+    public static final class PatternMapper extends AbstractAttributeMapper<PatternAttribute> {
+        public static final PatternMapper INSTANCE = new PatternMapper();
+
+        private PatternMapper() {
+            super(NAME_PATTERN, AttributeStability.STATELESS, true);
+        }
+
+        @Override
+        public PatternAttribute readAttribute(AttributedElement e, ClassReader cf, int p) {
+            return new BoundAttribute.BoundPatternAttribute(cf, this, p);
+        }
+
+        @Override
+        protected void writeBody(BufWriter buf, PatternAttribute attr) {
+            buf.writeIndex(attr.patternName());
+            buf.writeU2(attr.patternFlagsMask());
+            buf.writeIndex(attr.patternMethodType());
+            buf.writeList(attr.attributes());
+        }
+    }
 }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java
@@ -1102,6 +1102,8 @@ public static AttributeMapper<?> standardAttribute(Utf8Entry name) {
                 name.equalsString(NAME_STACK_MAP_TABLE) ? stackMapTable() : null;
             case 0x3dc79b7a ->
                 name.equalsString(NAME_SYNTHETIC) ? synthetic() : null;
+            case 0x7B286F27 ->
+                name.equalsString(NAME_PATTERN) ? pattern() : null;
             default -> null;
         };
     }
diff --git a/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java b/src/java.base/share/classes/jdk/internal/classfile/impl/UnboundAttribute.java
@@ -320,7 +320,7 @@ public static final class UnboundPatternAttribute
         private final List<Attribute<?>> attributes;
 
         public UnboundPatternAttribute(Utf8Entry matcherName, int matcherFlags, Utf8Entry matcherMethodType, List<Attribute<?>> attributes) {
-            super(Attributes.PATTERN);
+            super(Attributes.pattern());
             this.patternName = matcherName;
             this.patternFlags = matcherFlags;
             this.patternMethodType = matcherMethodType;
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -4314,7 +4314,17 @@ public void visitRecordPattern(JCRecordPattern tree) {
 
         List<Type> expectedRecordTypes = null;
 
-        if (site.tsym.kind == Kind.TYP) {
+        // todo: type check cases where a record class has deconstructors as well
+        if (((ClassSymbol) site.tsym).isRecord()) {
+            ClassSymbol record = (ClassSymbol) site.tsym;
+            expectedRecordTypes = record.getRecordComponents()
+                    .stream()
+                    .map(rc -> types.memberType(site, rc))
+                    .map(t -> types.upward(t, types.captures(t)).baseType())
+                    .collect(List.collector());
+            tree.record = record;
+        }
+        else if (site.tsym.kind == Kind.TYP) {
             int nestedPatternCount = tree.nested.size();
 
             // precalculate types of pattern components (as in method invocation)
@@ -4336,15 +4346,6 @@ public void visitRecordPattern(JCRecordPattern tree) {
                     expectedRecordTypes = types.memberType(site, patternDeclaration).getBindingTypes();
                     tree.patternDeclaration = patternDeclaration;
                 }
-
-            } else if (((ClassSymbol) site.tsym).isRecord()) {
-                ClassSymbol record = (ClassSymbol) site.tsym;
-                expectedRecordTypes = record.getRecordComponents()
-                                            .stream()
-                                            .map(rc -> types.memberType(site, rc))
-                                            .map(t -> types.upward(t, types.captures(t)).baseType())
-                                            .collect(List.collector());
-                tree.record = record;
             }
         }
 
diff --git a/test/langtools/tools/javac/diags/examples/NoCompatibleMatcherFound.java b/test/langtools/tools/javac/diags/examples/NoCompatibleMatcherFound.java
@@ -36,7 +36,7 @@ private static int test(D o) {
         return -1;
     }
 
-    public record D() {
+    public static class D {
         public pattern D(Object v1, Float out) {
             out = 10.0f;
         }
diff --git a/test/langtools/tools/javac/diags/examples/PatternDeclarationOverloadingAmbiguity.java b/test/langtools/tools/javac/diags/examples/PatternDeclarationOverloadingAmbiguity.java
@@ -34,7 +34,7 @@ private static int test(D o) {
         return -1;
     }
 
-    public record D() {
+    public static class D {
         public pattern D(Object v, Integer out) {
             match D(1, 1);
         }
diff --git a/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out b/test/langtools/tools/javac/patterns/DeconstructionPatternErrors.out
@@ -18,6 +18,6 @@ DeconstructionPatternErrors.java:26:29: compiler.err.instanceof.reifiable.not.sa
 DeconstructionPatternErrors.java:27:44: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)
 DeconstructionPatternErrors.java:27:13: compiler.err.instanceof.reifiable.not.safe: java.lang.Object, DeconstructionPatternErrors.GenRecord<java.lang.String>
 DeconstructionPatternErrors.java:28:40: compiler.err.match.binding.exists
-DeconstructionPatternErrors.java:29:56: compiler.err.match.binding.exists
-DeconstructionPatternErrors.java:29:64: compiler.err.match.binding.exists
+DeconstructionPatternErrors.java:29:56: compiler.err.already.defined: kindname.variable, v1, kindname.method, meth()
+DeconstructionPatternErrors.java:29:64: compiler.err.already.defined: kindname.variable, v2, kindname.method, meth()
 22 errors
diff --git a/test/langtools/tools/javac/patterns/declarations/MultiplePatternDeclarations.java b/test/langtools/tools/javac/patterns/declarations/MultiplePatternDeclarations.java
@@ -33,8 +33,6 @@ public class MultiplePatternDeclarations {
     public static void main(String... args) {
         assertEquals("A:B", test1A(new Person1("A", "B")));
         assertEquals("A", test1B(new Person1("A", "B")));
-        assertEquals("A:B", test2A(new Person2("A", "B")));
-        assertEquals("A", test2B(new Person2("A", "B")));
     }
 
     private static String test1A(Object o) {
@@ -51,21 +49,14 @@ private static String test1B(Object o) {
         return null;
     }
 
-    private static String test2A(Object o) {
-        if (o instanceof Person2(String name, String username)) {
-            return name + ":" + username;
-        }
-        return null;
-    }
+    public static class Person1 {
+        private final String name;
+        private final String username;
 
-    private static String test2B(Object o) {
-        if (o instanceof Person2(String name)) {
-            return name;
+        public Person1(String name, String username) {
+            this.name = name;
+            this.username = username;
         }
-        return null;
-    }
-
-    public record Person1(String name, String username) {
 
         public Person1(String name) {
             this(name, name);
@@ -80,17 +71,6 @@ public pattern Person1(String name) {
         }
     }
 
-    public record Person2(String name, String username) {
-
-        public Person2(String name) {
-            this(name, name);
-        }
-
-        public pattern Person2(String name) {
-            match Person2(this.name);
-        }
-    }
-
     private static <T> void assertEquals(T expected, T actual) {
         if (!Objects.equals(expected, actual)) {
             throw new AssertionError("Expected: " + expected + ", but got: " + actual);
diff --git a/test/langtools/tools/javac/patterns/declarations/OverloadedPatternDeclarationErrors.java b/test/langtools/tools/javac/patterns/declarations/OverloadedPatternDeclarationErrors.java
@@ -19,7 +19,7 @@ private static int test2(D2 o) {
         return -1;
     }
 
-    public record D() {
+    public static class D {
         public pattern D(Object v1, Float out) {
             match D(10.0f, 10.0f);
         }
@@ -29,7 +29,7 @@ public pattern D(Float out, Integer v1) {
         }
     }
 
-    public record D2() {
+    public static class D2 {
         public pattern D2(Object v, Integer out) {
             match D2("", 1);
         }
diff --git a/test/langtools/tools/javac/patterns/declarations/OverloadedPatternDeclarations.java b/test/langtools/tools/javac/patterns/declarations/OverloadedPatternDeclarations.java
@@ -76,7 +76,7 @@ private static Integer test5(D o) {
     static class A {}
     static class B extends A {}
 
-    public record D() {
+    public static class D {
         public pattern D(Object out, Integer outI) {
             match D(42, 1);
         }
diff --git a/test/langtools/tools/javac/patterns/declarations/OverloadedPrimitivePatternDeclarations.java b/test/langtools/tools/javac/patterns/declarations/OverloadedPrimitivePatternDeclarations.java
@@ -42,7 +42,7 @@ private static int testBoxing(D o) {
         return -1;
     }
 
-    public record D() {
+    public static class D {
         public pattern D(String out, int outI) {
             match D("42", 1);
         }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`* <li>{@link #moduleResolution()}`
`42`	`42`	`* <li>{@link #sourceDebugExtension()}`
`43`	`43`	`* <li>{@link #synthetic()}`
	`44`	`+ * <li>{@link #pattern()}`
`44`	`45`	`* </ul>`
`45`	`46`	`*`
`46`	`47`	`* The mappers with {@link AttributeStability#CP_REFS CP_REFS} stability are:`
`@@ -500,4 +501,11 @@ public static AttributeMapper<StackMapTableAttribute> stackMapTable() {`
`500`	`501`	`public static AttributeMapper<SyntheticAttribute> synthetic() {`
`501`	`502`	`return SyntheticMapper.INSTANCE;`
`502`	`503`	`}`
	`504`	`+`
	`505`	`+ /**`
	`506`	`+ * {@return Attribute mapper for the {@code Pattern} attribute}`
	`507`	`+ * The mapper permits multiple instances in a given location.`
	`508`	`+ * @since 23`
	`509`	`+ */`
	`510`	`+ public static AttributeMapper<PatternAttribute> pattern() { return PatternMapper.INSTANCE; }`
`503`	`511`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1102,6 +1102,8 @@ public static AttributeMapper<?> standardAttribute(Utf8Entry name) {`
`1102`	`1102`	`name.equalsString(NAME_STACK_MAP_TABLE) ? stackMapTable() : null;`
`1103`	`1103`	`case 0x3dc79b7a ->`
`1104`	`1104`	`name.equalsString(NAME_SYNTHETIC) ? synthetic() : null;`
	`1105`	`+ case 0x7B286F27 ->`
	`1106`	`+ name.equalsString(NAME_PATTERN) ? pattern() : null;`
`1105`	`1107`	`default -> null;`
`1106`	`1108`	`};`
`1107`	`1109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ private static int test(D o) {`
`36`	`36`	`return -1;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public record D() {`
	`39`	`+ public static class D {`
`40`	`40`	`public pattern D(Object v1, Float out) {`
`41`	`41`	`out = 10.0f;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private static int test(D o) {`
`34`	`34`	`return -1;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public record D() {`
	`37`	`+ public static class D {`
`38`	`38`	`public pattern D(Object v, Integer out) {`
`39`	`39`	`match D(1, 1);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ private static int test2(D2 o) {`
`19`	`19`	`return -1;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public record D() {`
	`22`	`+ public static class D {`
`23`	`23`	`public pattern D(Object v1, Float out) {`
`24`	`24`	`match D(10.0f, 10.0f);`
`25`	`25`	`}`
`@@ -29,7 +29,7 @@ public pattern D(Float out, Integer v1) {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public record D2() {`
	`32`	`+ public static class D2 {`
`33`	`33`	`public pattern D2(Object v, Integer out) {`
`34`	`34`	`match D2("", 1);`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private static Integer test5(D o) {`
`76`	`76`	`static class A {}`
`77`	`77`	`static class B extends A {}`
`78`	`78`
`79`		`- public record D() {`
	`79`	`+ public static class D {`
`80`	`80`	`public pattern D(Object out, Integer outI) {`
`81`	`81`	`match D(42, 1);`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private static int testBoxing(D o) {`
`42`	`42`	`return -1;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public record D() {`
	`45`	`+ public static class D {`
`46`	`46`	`public pattern D(String out, int outI) {`
`47`	`47`	`match D("42", 1);`
`48`	`48`	`}`