Add getModifiers substitutions that mask out NI-internal modifier bits

Author: DSouzaM

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/RuntimeMetadataDecoderImpl.java

@@ -36,6 +36,10 @@
 import java.util.List;
 import java.util.function.Function;
 
+import com.oracle.svm.core.reflect.target.Target_java_lang_reflect_Constructor;
+import com.oracle.svm.core.reflect.target.Target_java_lang_reflect_Field;
+import com.oracle.svm.core.reflect.target.Target_java_lang_reflect_Method;
+import com.oracle.svm.core.util.VMError;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.InternalPlatform;
 
@@ -110,6 +114,36 @@ static List<byte[]> getEncodings() {
         return Arrays.stream(MultiLayeredImageSingleton.getAllLayers(RuntimeMetadataEncoding.class)).map(RuntimeMetadataEncoding::getEncoding).toList();
     }
 
+    public static int clearInternalModifiers(int modifiers) {
+        return modifiers & (~ALL_FLAGS_MASK);
+    }
+
+    public static int getRawModifiers(Method m) {
+        assert m != null;
+        return SubstrateUtil.cast(m, Target_java_lang_reflect_Method.class).modifiers;
+    }
+
+    public static int getRawModifiers(Constructor<?> c) {
+        assert c != null;
+        return SubstrateUtil.cast(c, Target_java_lang_reflect_Constructor.class).modifiers;
+    }
+
+    public static int getRawModifiers(Executable ex) {
+        assert ex != null;
+        if (ex instanceof Method m) {
+            return getRawModifiers(m);
+        } else if (ex instanceof Constructor<?> c) {
+            return getRawModifiers(c);
+        } else {
+            throw VMError.shouldNotReachHere("Unexpected executable type");
+        }
+    }
+
+    public static int getRawModifiers(Field f) {
+        assert f != null;
+        return SubstrateUtil.cast(f, Target_java_lang_reflect_Field.class).modifiers;
+    }
+
     /**
      * Fields encoding.
      *

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -86,6 +86,7 @@
 import java.util.function.BiFunction;
 import java.util.function.IntFunction;
 
+import com.oracle.svm.core.code.RuntimeMetadataDecoderImpl;
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
@@ -1467,7 +1468,7 @@ private void checkField(String fieldName, Field field, boolean publicOnly) throw
             throw new NoSuchFieldException(fieldName);
         } else {
             RuntimeMetadataDecoder decoder = ImageSingletons.lookup(RuntimeMetadataDecoder.class);
-            int fieldModifiers = field.getModifiers();
+            int fieldModifiers = RuntimeMetadataDecoderImpl.getRawModifiers(field);
             boolean negative = decoder.isNegative(fieldModifiers);
             boolean hiding = decoder.isHiding(fieldModifiers);
             if (throwMissingErrors && hiding) {
@@ -1550,7 +1551,7 @@ private boolean checkExecutableExists(String methodName, Class<?>[] parameterTyp
             return true;
         } else {
             RuntimeMetadataDecoder decoder = ImageSingletons.lookup(RuntimeMetadataDecoder.class);
-            int methodModifiers = method.getModifiers();
+            int methodModifiers = RuntimeMetadataDecoderImpl.getRawModifiers(method);
             boolean negative = decoder.isNegative(methodModifiers);
             boolean hiding = decoder.isHiding(methodModifiers);
             if (throwMissingErrors && hiding) {
@@ -2350,7 +2351,7 @@ private static Field[] filterFields(Field... fields) {
         List<Field> filtered = new ArrayList<>();
         RuntimeMetadataDecoder decoder = ImageSingletons.lookup(RuntimeMetadataDecoder.class);
         for (Field field : fields) {
-            int modifiers = field.getModifiers();
+            int modifiers = RuntimeMetadataDecoderImpl.getRawModifiers(field);
             if (!decoder.isHiding(modifiers) && !decoder.isNegative(modifiers)) {
                 filtered.add(field);
             }
@@ -2362,7 +2363,7 @@ private static Method[] filterMethods(Method... methods) {
         List<Method> filtered = new ArrayList<>();
         RuntimeMetadataDecoder decoder = ImageSingletons.lookup(RuntimeMetadataDecoder.class);
         for (Method method : methods) {
-            int modifiers = method.getModifiers();
+            int modifiers = RuntimeMetadataDecoderImpl.getRawModifiers(method);
             if (!decoder.isHiding(modifiers) && !decoder.isNegative(modifiers)) {
                 filtered.add(method);
             }
@@ -2374,7 +2375,7 @@ private static Constructor<?>[] filterConstructors(Constructor<?>... constructor
         List<Constructor<?>> filtered = new ArrayList<>();
         RuntimeMetadataDecoder decoder = ImageSingletons.lookup(RuntimeMetadataDecoder.class);
         for (Constructor<?> constructor : constructors) {
-            if (!decoder.isNegative(constructor.getModifiers())) {
+            if (!decoder.isNegative(RuntimeMetadataDecoderImpl.getRawModifiers(constructor))) {
                 filtered.add(constructor);
             }
         }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_java_lang_reflect_Constructor.java

@@ -30,6 +30,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 
+import com.oracle.svm.core.code.RuntimeMetadataDecoderImpl;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.configure.config.ConfigurationMemberInfo;
@@ -60,6 +61,9 @@ public final class Target_java_lang_reflect_Constructor {
     @Alias @RecomputeFieldValue(kind = Kind.Custom, declClass = ParameterAnnotationsComputer.class)//
     byte[] parameterAnnotations;
 
+    @Alias //
+    public int modifiers;
+
     /**
      * Value of the accessor when `this` is in the image heap. `null` for run-time constructed
      * constructors.
@@ -99,6 +103,11 @@ public Target_jdk_internal_reflect_ConstructorAccessor acquireConstructorAccesso
         return constructorAccessorFromMetadata;
     }
 
+    @Substitute
+    public int getModifiers() {
+        return RuntimeMetadataDecoderImpl.clearInternalModifiers(modifiers);
+    }
+
     static class AnnotationsComputer extends ReflectionMetadataComputer {
         @Override
         public Object transform(Object receiver, Object originalValue) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_java_lang_reflect_Field.java

@@ -32,6 +32,7 @@
 import java.lang.reflect.Modifier;
 import java.util.Map;
 
+import com.oracle.svm.core.code.RuntimeMetadataDecoderImpl;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import com.oracle.svm.core.BuildPhaseProvider;
@@ -85,6 +86,9 @@ public final class Target_java_lang_reflect_Field {
     @Alias //
     boolean override;
 
+    @Alias //
+    public int modifiers;
+
     @Alias //
     public Target_java_lang_reflect_Field root;
 
@@ -135,6 +139,11 @@ private byte[] getTypeAnnotationBytes0() {
         return SubstrateUtil.cast(this, Target_java_lang_reflect_AccessibleObject.class).typeAnnotations;
     }
 
+    @Substitute
+    public int getModifiers() {
+        return RuntimeMetadataDecoderImpl.clearInternalModifiers(modifiers);
+    }
+
     public static final class FieldDeletionReasonComputer implements FieldValueTransformerWithAvailability {
         @Override
         public boolean isAvailable() {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/target/Target_java_lang_reflect_Method.java

@@ -32,6 +32,7 @@
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
+import com.oracle.svm.core.code.RuntimeMetadataDecoderImpl;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 
@@ -102,7 +103,7 @@ public final class Target_java_lang_reflect_Method {
     private Class<?>[] exceptionTypes;
 
     @Alias //
-    private int modifiers;
+    public int modifiers;
 
     @Alias //
     private transient String signature;
@@ -192,6 +193,11 @@ Target_java_lang_reflect_Method copy() {
         return res;
     }
 
+    @Substitute
+    public int getModifiers() {
+        return RuntimeMetadataDecoderImpl.clearInternalModifiers(modifiers);
+    }
+
     static class AnnotationsComputer extends ReflectionMetadataComputer {
         @Override
         public Object transform(Object receiver, Object originalValue) {