8364187: Make getClassAccessFlagsRaw non-native

src/hotspot/share/classfile/javaClasses.cpp

@@ -1526,7 +1526,7 @@ oop java_lang_Class::primitive_mirror(BasicType t) {
   macro(_reflectionData_offset,      k, "reflectionData",      java_lang_ref_SoftReference_signature, false); \
   macro(_signers_offset,             k, "signers",             object_array_signature, false); \
   macro(_modifiers_offset,           k, vmSymbols::modifiers_name(), char_signature,    false); \
-  macro(_raw_access_flags_offset,    k, "rawAccessFlags",      char_signature,    false); \
+  macro(_raw_access_flags_offset,    k, "classFileAccessFlags",      char_signature,    false); \
   macro(_protection_domain_offset,   k, "protectionDomain",    java_security_ProtectionDomain_signature,  false); \
   macro(_is_primitive_offset,        k, "primitive",           bool_signature,         false);
 

src/java.base/share/classes/java/lang/Class.java

@@ -245,7 +245,7 @@ private Class(ClassLoader loader, Class<?> arrayComponentType, char mods, Protec
         modifiers = mods;
         protectionDomain = pd;
         primitive = isPrim;
-        rawAccessFlags = flags;
+        classFileAccessFlags = flags;
     }
 
     /**
@@ -1009,7 +1009,7 @@ public Module getModule() {
     private transient Object classData; // Set by VM
     private transient Object[] signers; // Read by VM, mutable
     private final transient char modifiers;  // Set by the VM
-    private final transient char rawAccessFlags;  // Set by the VM
+    private final transient char classFileAccessFlags;  // Set by the VM
     private final transient boolean primitive;  // Set by the VM if the Class is a primitive type.
 
     // package-private
@@ -1381,13 +1381,13 @@ public Set<AccessFlag> accessFlags() {
         // Location.CLASS allows SUPER and AccessFlag.MODULE which
         // INNER_CLASS forbids. INNER_CLASS allows PRIVATE, PROTECTED,
         // and STATIC, which are not allowed on Location.CLASS.
-        // Use getRawClassAccessFlags to expose SUPER status.
+        // Use getClassFileAccessFlags to expose SUPER status.
         var location = (isMemberClass() || isLocalClass() ||
                         isAnonymousClass() || isArray()) ?
             AccessFlag.Location.INNER_CLASS :
             AccessFlag.Location.CLASS;
         return getReflectionFactory().parseAccessFlags((location == AccessFlag.Location.CLASS) ?
-                        getRawClassAccessFlags() : getModifiers(), location, this);
+                        getClassFileAccessFlags() : getModifiers(), location, this);
     }
 
     /**
@@ -4132,11 +4132,17 @@ int getClassFileVersion() {
 
     private native int getClassFileVersion0();
 
-    /**
-     * Return the access flags as they were in the class's bytecode, including
-     * the original setting of ACC_SUPER.
-     */
-    int getRawClassAccessFlags() {
-        return rawAccessFlags;
-    }
+     /**
+      * Return the access flags as they were in the class's bytecode, including
+      * the original setting of ACC_SUPER.
+      *
+      * If this {@code Class} object represents a primitive type or
+      * void, the flags are {@code PUBLIC}, {@code ABSTRACT}, and
+      * {@code FINAL}.
+      * If this {@code Class} object represents an array type return 0. This
+      * is not called in Class but can be called with an array type in Reflection.
+      */
+     int getClassFileAccessFlags() {
+         return classFileAccessFlags;
+     }
 }

src/java.base/share/classes/java/lang/System.java

@@ -2022,8 +2022,8 @@ public byte[] getRawClassTypeAnnotations(Class<?> klass) {
             public byte[] getRawExecutableTypeAnnotations(Executable executable) {
                 return Class.getExecutableTypeAnnotationBytes(executable);
             }
-            public int getRawClassAccessFlags(Class<?> klass) {
-                return klass.getRawClassAccessFlags();
+            public int getClassFileAccessFlags(Class<?> klass) {
+                return klass.getClassFileAccessFlags();
             }
             public <E extends Enum<E>>
             E[] getEnumConstantsShared(Class<E> klass) {

src/java.base/share/classes/jdk/internal/access/JavaLangAccess.java

@@ -115,7 +115,7 @@ public interface JavaLangAccess {
     /**
      * Get the int value of the Class's class-file access flags.
      */
-    int getRawClassAccessFlags(Class<?> klass);
+    int getClassFileAccessFlags(Class<?> klass);
 
     /**
      * Returns the elements of an enum class or null if the

src/java.base/share/classes/jdk/internal/reflect/Reflection.java

@@ -85,7 +85,7 @@ public static int getClassAccessFlags(Class<?> c) {
         class Holder {
             static final JavaLangAccess JLA = SharedSecrets.getJavaLangAccess();
         }
-        return Holder.JLA.getRawClassAccessFlags(c);
+        return Holder.JLA.getClassFileAccessFlags(c);
     }
 
 

test/hotspot/jtreg/runtime/ClassFile/ClassAccessFlagsRawTest.java

@@ -32,6 +32,7 @@
  */
 
 import java.lang.reflect.*;
+import java.util.Set;
 
 public class ClassAccessFlagsRawTest {
 
@@ -48,28 +49,53 @@ public static void testIt(String className, int expectedResult) throws Exception
 
     public static void main(String argv[]) throws Throwable {
         Class<?> cl = java.lang.Class.class;
-        m = cl.getDeclaredMethod("getRawClassAccessFlags", new Class[0]);
+        m = cl.getDeclaredMethod("getClassFileAccessFlags", new Class[0]);
         m.setAccessible(true);
 
         testIt("SUPERset", 0x21);  // ACC_SUPER 0x20 + ACC_PUBLIC 0x1
         testIt("SUPERnotset", Modifier.PUBLIC);
 
-        // test primitive array.  should return ACC_ABSTRACT | ACC_FINAL | ACC_PUBLIC.
-        int flags = (int)m.invoke((new int[3]).getClass());
+        // Test that primitive should return ACC_ABSTRACT | ACC_FINAL | ACC_PUBLIC.
+        int[] arr = new int[3];
+        if (!arr.getClass().getComponentType().isPrimitive()) {
+            throw new RuntimeException("not primitive");
+        }
+        int flags = (int)m.invoke(arr.getClass().getComponentType());
         if (flags != (Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC)) {
             throw new RuntimeException(
-                "expected 0x411, got 0x" + Integer.toHexString(flags) + " for primitive array");
+                "expected 0x411, got 0x" + Integer.toHexString(flags) + " for primitive type");
+        }
+
+        // Test that primitive array raw access flags return 0.
+        flags = (int)m.invoke(arr.getClass());
+        if (flags != 0) {
+            throw new RuntimeException(
+                "expected 0x0 got 0x" + Integer.toHexString(flags) + " for primitive array");
         }
 
-        // test object array.  should return flags of component.
+        // Test that the modifier flags return element type flags.
+        flags = (int)arr.getClass().getModifiers();
+        if (flags != (Modifier.ABSTRACT | Modifier.FINAL | Modifier.PUBLIC)) {
+            throw new RuntimeException(
+                "expected 0x411, got 0x" + Integer.toHexString(flags) + " for primitive type");
+        }
+
+        // Test that AccessFlags set will return element type access flags.
+        Set<AccessFlag> aacc = arr.getClass().accessFlags();
+        if (!aacc.containsAll(Set.of(AccessFlag.FINAL, AccessFlag.ABSTRACT, AccessFlag.PUBLIC))) {
+            throw new RuntimeException(
+                "AccessFlags should contain FINAL, ABSTRACT and PUBLIC for primitive type");
+        }
+
+        // Test object array.  Raw access flags are 0 for arrays.
         flags = (int)m.invoke((new SUPERnotset[2]).getClass());
-        if (flags != Modifier.PUBLIC) {
+        if (flags != 0) {
             throw new RuntimeException(
-                "expected 0x1, got 0x" + Integer.toHexString(flags) + " for object array");
+                "expected 0x0, got 0x" + Integer.toHexString(flags) + " for object array");
         }
 
-        // test multi-dimensional object array.  should return flags of component.
-        flags = (int)m.invoke((new SUPERnotset[4][2]).getClass());
+        // Test object array component type.
+        flags = (int)m.invoke((new SUPERnotset[2]).getClass().getComponentType());
         if (flags != Modifier.PUBLIC) {
             throw new RuntimeException(
                 "expected 0x1, got 0x" + Integer.toHexString(flags) + " for object array");