8281463: [lworld] VALUE / PRIMITIVE modifiers should be supported by reflection

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

@@ -204,7 +204,6 @@ public final class Class<T> implements java.io.Serializable,
     private static final int ENUM       = 0x00004000;
     private static final int SYNTHETIC  = 0x00001000;
     private static final int VALUE_CLASS     = 0x00000040;
-    private static final int PERMITS_VALUE   = 0x00000100;
     private static final int PRIMITIVE_CLASS = 0x00000800;
 
     private static native void registerNatives();
@@ -511,8 +510,8 @@ private static Class<?> forName(String name, boolean initialize, ClassLoader loa
 
     /** Called after security check for system loader access checks have been made. */
     private static native Class<?> forName0(String name, boolean initialize,
-                                    ClassLoader loader,
-                                    Class<?> caller)
+                                            ClassLoader loader,
+                                            Class<?> caller)
         throws ClassNotFoundException;
 
 
@@ -1505,6 +1504,14 @@ public Set<AccessFlag> accessFlags() {
                                             AccessFlag.Location.CLASS);
     }
 
+    /**
+     * {@return true if this class has the requested {@link AccessFlag}}
+     * @param flag an {@link AccessFlag}
+     */
+    public boolean is(AccessFlag flag) {
+        return (getModifiers() & flag.mask()) == flag.mask();
+    }
+
     /**
      * If this {@code Class} object represents a local or anonymous
      * class within a method, returns a {@link

src/java.base/share/classes/java/lang/reflect/AccessFlag.java

@@ -131,14 +131,12 @@ public enum AccessFlag {
      * ACC_SUPER or the class file version number, and the flag no longer had any effect.
      * Now the flag has been repurposed as ACC_IDENTITY.
      */
-    SUPER(0x0000_0020, false, Set.of(Location.CLASS)),
+//    SUPER(0x0000_0020, false, Set.of(Location.CLASS)),
 
     /**
-     * The access flag {@code ACC_IDENTITY} corresponding to the
-     * source modifier {@link Modifier#VALUE value} with a mask
-     * value of {@code 0x0020}.
+     * The access flag {@code ACC_IDENTITY} with a mask value of {@code 0x0020}.
      */
-    IDENTITY(Modifier.IDENTITY, true, Set.of(Location.CLASS)),
+    IDENTITY(0x0000_0020, false, Set.of(Location.CLASS)),
 
     /**
      * The module flag {@code ACC_OPEN} with a mask value of {@code
@@ -169,11 +167,9 @@ public enum AccessFlag {
     STATIC_PHASE(0x0000_0040, false, Set.of(Location.MODULE_REQUIRES)),
 
     /**
-     * The access flag {@code ACC_VALUE} corresponding to the
-     * source modifier {@link Modifier#VALUE value} with a mask
-     * value of {@code 0x0040}.
+     * The access flag {@code ACC_VALUE} with a mask value of {@code 0x0040}.
      */
-    VALUE(Modifier.VALUE, true, Set.of(Location.CLASS)),
+    VALUE(0x0000_0040, false, Set.of(Location.CLASS)),
 
     /**
       * The access flag {@code ACC_VOLATILE}, corresponding to the
@@ -227,11 +223,9 @@ public enum AccessFlag {
              Set.of(Location.CLASS, Location.METHOD, Location.INNER_CLASS)),
 
     /**
-     * The access flag {@code ACC_PRIMITIVE}, corresponding to the source
-     * modifier {@link Modifier#PRIMITIVE primitive} with a mask
-     * value of {@code 0x0800}.
+     * The access flag {@code ACC_PRIMITIVE} with a mask value of {@code 0x0800}.
      */
-    PRIMITIVE(Modifier.PRIMITIVE, true, Set.of(Location.CLASS)),
+    PRIMITIVE(0x0000_0800, false, Set.of(Location.CLASS)),
 
     /**
      * The access flag {@code ACC_STRICT}, corresponding to the source
@@ -431,7 +425,7 @@ private static class LocationToFlags {
                                        BRIDGE, VARARGS, NATIVE,
                                        ABSTRACT, STRICT, SYNTHETIC)),
                           entry(Location.INNER_CLASS,
-                                Set.of(PUBLIC, PRIVATE, PROTECTED,
+                                Set.of(PUBLIC, PRIVATE, PROTECTED, IDENTITY, VALUE, PRIMITIVE,
                                        STATIC, FINAL, INTERFACE, ABSTRACT,
                                        SYNTHETIC, ANNOTATION, ENUM)),
                           entry(Location.METHOD_PARAMETER,

src/java.base/share/classes/java/lang/reflect/Modifier.java

@@ -232,9 +232,6 @@ public static boolean isStrict(int mod) {
      * {@code toString} with the appropriate mask from a method like
      * {@link #constructorModifiers} or {@link #methodModifiers}.
      *
-     * @apiNote TBD: This method does not reflect the class related modifiers including
-     * {@link #IDENTITY}, {@link #VALUE}, and {@link #PRIMITIVE}.
-     *
      * @param   mod a set of modifiers
      * @return  a string representation of the set of modifiers
      * represented by {@code mod}
@@ -300,27 +297,13 @@ public static String toString(int mod) {
      */
     public static final int FINAL            = 0x00000010;
 
-    /**
-     * The {@code int} value representing the {@code ACC_IDENTITY}
-     * modifier when applied to the modifiers of a class.
-     * @see AccessFlag#IDENTITY
-     */
-    public static final int IDENTITY         = 0x00000020;
-
     /**
      * The {@code int} value representing the {@code synchronized}
      * modifier.
      * @see AccessFlag#SYNCHRONIZED
      */
     public static final int SYNCHRONIZED     = 0x00000020;
 
-    /**
-     * The {@code int} value representing the {@code ACC_VALUE}
-     * modifier when applied to the modifiers of a class.
-     * @see AccessFlag#VALUE
-     */
-    public static final int VALUE            = 0x00000040;
-
     /**
      * The {@code int} value representing the {@code volatile}
      * modifier.
@@ -362,13 +345,6 @@ public static String toString(int mod) {
      */
     public static final int STRICT           = 0x00000800;
 
-    /**
-     * The {@code int} value representing the {@code ACC_PRIMITIVE}
-     * modifier when applied to the modifiers of a class.
-     * @see AccessFlag#PRIMITIVE
-     */
-    public static final int PRIMITIVE        = 0x00000800;
-
     // Bits not (yet) exposed in the public API either because they
     // have different meanings for fields and methods and there is no
     // way to distinguish between the two in this class, or because
@@ -403,7 +379,6 @@ static boolean isMandated(int mod) {
      */
     private static final int CLASS_MODIFIERS =
         Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.IDENTITY       | Modifier.VALUE        | Modifier.PRIMITIVE |
         Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.FINAL   |
         Modifier.STRICT;
 
@@ -413,7 +388,6 @@ static boolean isMandated(int mod) {
      */
     private static final int INTERFACE_MODIFIERS =
         Modifier.PUBLIC         | Modifier.PROTECTED    | Modifier.PRIVATE |
-        Modifier.IDENTITY       | Modifier.VALUE        |
         Modifier.ABSTRACT       | Modifier.STATIC       | Modifier.STRICT;
 
 

src/java.base/share/classes/jdk/internal/org/objectweb/asm/Type.java

@@ -58,6 +58,7 @@
  */
 package jdk.internal.org.objectweb.asm;
 
+import java.lang.reflect.AccessFlag;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -682,8 +683,7 @@ private static void appendDescriptor(final Class<?> clazz, final StringBuilder s
     }
 
     static boolean isPrimitiveClass(Class<?> clazz) {
-        int mods = clazz.getModifiers();
-        return (mods & 0x00000100) != 0;
+        return clazz.is(AccessFlag.PRIMITIVE);
     }
 
     // -----------------------------------------------------------------------------------------------

test/langtools/tools/javac/valhalla/lworld-values/InnerClassAttributeValuenessTest.java

@@ -29,7 +29,8 @@
  * @run main/othervm InnerClassAttributeValuenessTest
  */
 
-import com.sun.tools.classfile.AccessFlags;
+import java.lang.reflect.AccessFlag;
+import java.util.Set;
 
 public class InnerClassAttributeValuenessTest {
 
@@ -48,7 +49,12 @@ public static Inner create(int v) {
     }
 
     public static void main(String[] args) {
-        if ((Inner.class.getModifiers() & AccessFlags.ACC_PRIMITIVE) == 0)
+        Set<AccessFlag> flags = Inner.class.accessFlags();
+        System.out.println("accessFlags: " + flags);
+
+        if (!Inner.class.is(AccessFlag.VALUE))
             throw new AssertionError("Value flag missing");
+        if (!Inner.class.is(AccessFlag.PRIMITIVE))
+            throw new AssertionError("Primitive Value flag missing");
     }
 }