Automatic merge of jdk:master into master

Author: duke

src/java.base/share/classes/java/lang/classfile/ClassReader.java

@@ -27,10 +27,6 @@
 import java.lang.classfile.constantpool.ClassEntry;
 import java.lang.classfile.constantpool.ConstantPool;
 import java.lang.classfile.constantpool.ConstantPoolException;
-import java.lang.classfile.constantpool.MethodHandleEntry;
-import java.lang.classfile.constantpool.ModuleEntry;
-import java.lang.classfile.constantpool.NameAndTypeEntry;
-import java.lang.classfile.constantpool.PackageEntry;
 import java.lang.classfile.constantpool.PoolEntry;
 import java.lang.classfile.constantpool.Utf8Entry;
 import jdk.internal.classfile.impl.ClassReaderImpl;
@@ -130,77 +126,6 @@ public sealed interface ClassReader extends ConstantPool
      */
     <T extends PoolEntry> T readEntryOrNull(int offset, Class<T> cls);
 
-    /**
-     * {@return the UTF8 entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a UTF8 entry
-     */
-    Utf8Entry readUtf8Entry(int offset);
-
-    /**
-     * {@return the UTF8 entry whose index is given at the specified
-     * offset within the classfile, or null if the index at the specified
-     * offset is zero}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or the index does not correspond to
-     *         a UTF8 entry
-     */
-    Utf8Entry readUtf8EntryOrNull(int offset);
-
-    /**
-     * {@return the module entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a module entry
-     */
-    ModuleEntry readModuleEntry(int offset);
-
-    /**
-     * {@return the package entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a package entry
-     */
-    PackageEntry readPackageEntry(int offset);
-
-    /**
-     * {@return the class entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a class entry
-     */
-    ClassEntry readClassEntry(int offset);
-
-    /**
-     * {@return the name-and-type entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a name-and-type entry
-     */
-    NameAndTypeEntry readNameAndTypeEntry(int offset);
-
-    /**
-     * {@return the method handle entry whose index is given at the specified
-     * offset within the classfile}
-     * @param offset the offset of the index within the classfile
-     * @throws ConstantPoolException if the index is out of range of the
-     *         constant pool size, or zero, or the index does not correspond to
-     *         a method handle entry
-     */
-    MethodHandleEntry readMethodHandleEntry(int offset);
-
     /**
      * {@return the unsigned byte at the specified offset within the classfile}
      * @param offset the offset within the classfile

src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java

@@ -529,7 +529,7 @@ public static final class BoundNewObjectInstruction
         @Override
         public ClassEntry className() {
             if (classEntry == null)
-                classEntry = code.classReader.readClassEntry(pos + 1);
+                classEntry = code.classReader.readEntry(pos + 1, ClassEntry.class);
             return classEntry;
         }
 
@@ -576,7 +576,7 @@ public BoundNewReferenceArrayInstruction(Opcode op, CodeImpl code, int pos) {
 
         @Override
         public ClassEntry componentType() {
-            return code.classReader.readClassEntry(pos + 1);
+            return code.classReader.readEntry(pos + 1, ClassEntry.class);
         }
 
         @Override
@@ -607,7 +607,7 @@ public int dimensions() {
 
         @Override
         public ClassEntry arrayType() {
-            return code.classReader.readClassEntry(pos + 1);
+            return code.classReader.readEntry(pos + 1, ClassEntry.class);
         }
 
         @Override
@@ -636,7 +636,7 @@ public BoundTypeCheckInstruction(Opcode op, CodeImpl code, int pos) {
         @Override
         public ClassEntry type() {
             if (typeEntry == null)
-                typeEntry = code.classReader.readClassEntry(pos + 1);
+                typeEntry = code.classReader.readEntry(pos + 1, ClassEntry.class);
             return typeEntry;
         }
 

src/java.base/share/classes/jdk/internal/classfile/impl/AnnotationReader.java

@@ -66,9 +66,10 @@ public static AnnotationValue readElementValue(ClassReader classReader, int p) {
             case AEV_LONG -> new AnnotationImpl.OfLongImpl(classReader.readEntry(p, LongEntry.class));
             case AEV_SHORT -> new AnnotationImpl.OfShortImpl(classReader.readEntry(p, IntegerEntry.class));
             case AEV_BOOLEAN -> new AnnotationImpl.OfBooleanImpl(classReader.readEntry(p, IntegerEntry.class));
-            case AEV_STRING -> new AnnotationImpl.OfStringImpl(classReader.readUtf8Entry(p));
-            case AEV_ENUM -> new AnnotationImpl.OfEnumImpl(classReader.readUtf8Entry(p), classReader.readUtf8Entry(p + 2));
-            case AEV_CLASS -> new AnnotationImpl.OfClassImpl(classReader.readUtf8Entry(p));
+            case AEV_STRING -> new AnnotationImpl.OfStringImpl(classReader.readEntry(p, Utf8Entry.class));
+            case AEV_ENUM -> new AnnotationImpl.OfEnumImpl(classReader.readEntry(p, Utf8Entry.class),
+                    classReader.readEntry(p + 2, Utf8Entry.class));
+            case AEV_CLASS -> new AnnotationImpl.OfClassImpl(classReader.readEntry(p, Utf8Entry.class));
             case AEV_ANNOTATION -> new AnnotationImpl.OfAnnotationImpl(readAnnotation(classReader, p));
             case AEV_ARRAY -> {
                 int numValues = classReader.readU2(p);
@@ -127,7 +128,7 @@ private static int skipElementValue(ClassReader classReader, int p) {
     }
 
     private static Annotation readAnnotation(ClassReader classReader, int p) {
-        Utf8Entry annotationClass = classReader.entryByIndex(classReader.readU2(p), Utf8Entry.class);
+        Utf8Entry annotationClass = classReader.readEntry(p, Utf8Entry.class);
         p += 2;
         List<AnnotationElement> elems = readAnnotationElementValuePairs(classReader, p);
         return new AnnotationImpl(annotationClass, elems);
@@ -150,7 +151,7 @@ private static List<AnnotationElement> readAnnotationElementValuePairs(ClassRead
         p += 2;
         var annotationElements = new Object[numElementValuePairs];
         for (int i = 0; i < numElementValuePairs; ++i) {
-            Utf8Entry elementName = classReader.readUtf8Entry(p);
+            Utf8Entry elementName = classReader.readEntry(p, Utf8Entry.class);
             p += 2;
             AnnotationValue value = readElementValue(classReader, p);
             annotationElements[i] = new AnnotationImpl.AnnotationElementImpl(elementName, value);
@@ -239,7 +240,7 @@ private static TypeAnnotation readTypeAnnotation(ClassReader classReader, int p,
             };
         }
         // the annotation info for this annotation
-        Utf8Entry type = classReader.readUtf8Entry(p);
+        Utf8Entry type = classReader.readEntry(p, Utf8Entry.class);
         p += 2;
         return TypeAnnotation.of(targetInfo, List.of(typePath), type,
                                  readAnnotationElementValuePairs(classReader, p));

src/java.base/share/classes/jdk/internal/classfile/impl/BoundAttribute.java

@@ -135,7 +135,7 @@ public static List<Attribute<?>> readAttributes(AttributedElement enclosing, Cla
         int cfLen = reader.classfileLength();
         var apo = ((ClassReaderImpl)reader).context().attributesProcessingOption();
         for (int i = 0; i < size; ++i) {
-            Utf8Entry name = reader.readUtf8Entry(p);
+            Utf8Entry name = reader.readEntry(p, Utf8Entry.class);
             int len = reader.readInt(p + 2);
             p += 6;
             if (len < 0 || len > cfLen - p) {
@@ -347,7 +347,7 @@ public List<MethodParameterInfo> parameters() {
                 int p = payloadStart + 1;
                 int pEnd = p + (cnt * 4);
                 for (int i = 0; p < pEnd; p += 4, i++) {
-                    Utf8Entry name = classReader.readUtf8EntryOrNull(p);
+                    Utf8Entry name = classReader.readEntryOrNull(p, Utf8Entry.class);
                     int accessFlags = classReader.readU2(p + 2);
                     elements[i] = MethodParameterInfo.of(Optional.ofNullable(name), accessFlags);
                 }
@@ -367,7 +367,7 @@ public BoundModuleHashesAttribute(ClassReader cf, AttributeMapper<ModuleHashesAt
 
         @Override
         public Utf8Entry algorithm() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
 
         @Override
@@ -378,7 +378,7 @@ public List<ModuleHashInfo> hashes() {
                 int p = payloadStart + 4;
                 //System.err.printf("%5d: ModuleHashesAttr alg = %s, cnt = %d%n", pos, algorithm(), cnt);
                 for (int i = 0; i < cnt; ++i) {
-                    ModuleEntry module = classReader.readModuleEntry(p);
+                    ModuleEntry module = classReader.readEntry(p, ModuleEntry.class);
                     int hashLength = classReader.readU2(p + 2);
                     //System.err.printf("%5d:     [%d] module = %s, hashLength = %d%n", p, i, module, hashLength);
                     p += 4;
@@ -430,7 +430,7 @@ public BoundSignatureAttribute(ClassReader cf, AttributeMapper<SignatureAttribut
 
         @Override
         public Utf8Entry signature() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
     }
 
@@ -442,7 +442,7 @@ public BoundSourceFileAttribute(ClassReader cf, AttributeMapper<SourceFileAttrib
 
         @Override
         public Utf8Entry sourceFile() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
 
     }
@@ -454,7 +454,7 @@ public BoundModuleMainClassAttribute(ClassReader cf, AttributeMapper<ModuleMainC
 
         @Override
         public ClassEntry mainClass() {
-            return classReader.readClassEntry(payloadStart);
+            return classReader.readEntry(payloadStart, ClassEntry.class);
         }
     }
 
@@ -466,7 +466,7 @@ public BoundNestHostAttribute(ClassReader cf, AttributeMapper<NestHostAttribute>
 
         @Override
         public ClassEntry nestHost() {
-            return classReader.readClassEntry(payloadStart);
+            return classReader.readEntry(payloadStart, ClassEntry.class);
         }
     }
 
@@ -498,7 +498,7 @@ public BoundModuleTargetAttribute(ClassReader cf, AttributeMapper<ModuleTargetAt
 
         @Override
         public Utf8Entry targetPlatform() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
     }
 
@@ -510,7 +510,7 @@ public BoundCompilationIDAttribute(ClassReader cf, AttributeMapper<CompilationID
 
         @Override
         public Utf8Entry compilationId() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
     }
 
@@ -522,7 +522,7 @@ public BoundSourceIDAttribute(ClassReader cf, AttributeMapper<SourceIDAttribute>
 
         @Override
         public Utf8Entry sourceId() {
-            return classReader.readUtf8Entry(payloadStart);
+            return classReader.readEntry(payloadStart, Utf8Entry.class);
         }
     }
 
@@ -569,7 +569,7 @@ public BoundModuleAttribute(ClassReader cf, AttributeMapper<ModuleAttribute> map
 
         @Override
         public ModuleEntry moduleName() {
-            return classReader.readModuleEntry(payloadStart);
+            return classReader.readEntry(payloadStart, ModuleEntry.class);
         }
 
         @Override
@@ -579,7 +579,7 @@ public int moduleFlagsMask() {
 
         @Override
         public Optional<Utf8Entry> moduleVersion() {
-            return Optional.ofNullable(classReader.readUtf8EntryOrNull(payloadStart + 4));
+            return Optional.ofNullable(classReader.readEntryOrNull(payloadStart + 4, Utf8Entry.class));
         }
 
         @Override
@@ -630,7 +630,7 @@ private void structure() {
                 ModuleRequireInfo[] elements = new ModuleRequireInfo[cnt];
                 int end = p + (cnt * 6);
                 for (int i = 0; p < end; p += 6, i++) {
-                    elements[i] = ModuleRequireInfo.of(classReader.readModuleEntry(p),
+                    elements[i] = ModuleRequireInfo.of(classReader.readEntry(p, ModuleEntry.class),
                             classReader.readU2(p + 2),
                             classReader.readEntryOrNull(p + 4, Utf8Entry.class));
                 }
@@ -642,7 +642,7 @@ private void structure() {
                 p += 2;
                 ModuleExportInfo[] elements = new ModuleExportInfo[cnt];
                 for (int i = 0; i < cnt; i++) {
-                    PackageEntry pe = classReader.readPackageEntry(p);
+                    PackageEntry pe = classReader.readEntry(p, PackageEntry.class);
                     int exportFlags = classReader.readU2(p + 2);
                     p += 4;
                     List<ModuleEntry> exportsTo = readEntryList(p);
@@ -657,7 +657,7 @@ private void structure() {
                 p += 2;
                 ModuleOpenInfo[] elements = new ModuleOpenInfo[cnt];
                 for (int i = 0; i < cnt; i++) {
-                    PackageEntry po = classReader.readPackageEntry(p);
+                    PackageEntry po = classReader.readEntry(p, PackageEntry.class);
                     int opensFlags = classReader.readU2(p + 2);
                     p += 4;
                     List<ModuleEntry> opensTo = readEntryList(p);
@@ -675,7 +675,7 @@ private void structure() {
                 ModuleProvideInfo[] elements = new ModuleProvideInfo[cnt];
                 provides = new ArrayList<>(cnt);
                 for (int i = 0; i < cnt; i++) {
-                    ClassEntry c = classReader.readClassEntry(p);
+                    ClassEntry c = classReader.readEntry(p, ClassEntry.class);
                     p += 2;
                     List<ClassEntry> providesWith = readEntryList(p);
                     p += 2 + providesWith.size() * 2;
@@ -743,8 +743,7 @@ public List<BootstrapMethodEntry> bootstrapMethods() {
                 BootstrapMethodEntry[] bs = new BootstrapMethodEntry[size];
                 int p = payloadStart + 2;
                 for (int i = 0; i < size; ++i) {
-                    final AbstractPoolEntry.MethodHandleEntryImpl handle
-                            = (AbstractPoolEntry.MethodHandleEntryImpl) classReader.readMethodHandleEntry(p);
+                    final var handle = classReader.readEntry(p, AbstractPoolEntry.MethodHandleEntryImpl.class);
                     final List<LoadableConstantEntry> args = readEntryList(p + 2);
                     p += 4 + args.size() * 2;
                     int hash = BootstrapMethodEntryImpl.computeHashCode(handle, args);
@@ -771,7 +770,7 @@ public List<InnerClassInfo> classes() {
                 int p = payloadStart + 2;
                 InnerClassInfo[] elements = new InnerClassInfo[cnt];
                 for (int i = 0; i < cnt; i++) {
-                    ClassEntry innerClass = classReader.readClassEntry(p);
+                    ClassEntry innerClass = classReader.readEntry(p, ClassEntry.class);
                     var outerClass = classReader.readEntryOrNull(p + 2, ClassEntry.class);
                     var innerName = classReader.readEntryOrNull(p + 4, Utf8Entry.class);
                     int flags = classReader.readU2(p + 6);
@@ -792,7 +791,7 @@ public BoundEnclosingMethodAttribute(ClassReader cf, AttributeMapper<EnclosingMe
 
         @Override
         public ClassEntry enclosingClass() {
-            return classReader.readClassEntry(payloadStart);
+            return classReader.readEntry(payloadStart, ClassEntry.class);
         }
 
         @Override

src/java.base/share/classes/jdk/internal/classfile/impl/BoundRecordComponentInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -46,12 +46,12 @@ public BoundRecordComponentInfo(ClassReader reader, int startPos) {
 
     @Override
     public Utf8Entry name() {
-        return reader.readUtf8Entry(startPos);
+        return reader.readEntry(startPos, Utf8Entry.class);
     }
 
     @Override
     public Utf8Entry descriptor() {
-        return reader.readUtf8Entry(startPos + 2);
+        return reader.readEntry(startPos + 2, Utf8Entry.class);
     }
 
     @Override

src/java.base/share/classes/jdk/internal/classfile/impl/ClassImpl.java

@@ -137,7 +137,7 @@ public List<ClassEntry> interfaces() {
             pos += 2;
             var arr = new Object[cnt];
             for (int i = 0; i < cnt; ++i) {
-                arr[i] = reader.readClassEntry(pos);
+                arr[i] = reader.readEntry(pos, ClassEntry.class);
                 pos += 2;
             }
             this.interfaces = SharedSecrets.getJavaUtilCollectionAccess().listFromTrustedArray(arr);