Implemented new logic for registration of members as JNI accessible

Author: Mihailo Markovic

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/ReflectionDynamicAccess.java

@@ -49,22 +49,4 @@ public interface ReflectionDynamicAccess {
      * "https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#findclass">FindClass</a>.
      */
     void registerForJNIAccess(InclusionCondition condition, Class<?>... classes);
-
-    /**
-     * Makes the provided methods available for JNI access at runtime if {@code condition} is
-     * satisfied. Needed when native code looks up Java methods via <a href=
-     * "https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#getmethodid">GetMethodID</a>
-     * or <a href=
-     * "https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#getstaticmethodid">GetStaticMethodID</a>.
-     */
-    void registerForJNIAccess(InclusionCondition condition, Executable... methods);
-
-    /**
-     * Makes the provided methods available for JNI access at runtime if {@code condition} is
-     * satisfied. Needed when native code looks up Java methods via <a href=
-     * "https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#getmethodid">GetMethodID</a>
-     * or <a href=
-     * "https://docs.oracle.com/en/java/javase/17/docs/specs/jni/functions.html#getstaticmethodid">GetStaticMethodID</a>.
-     */
-    void registerForJNIAccess(InclusionCondition condition, Field... fields);
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeReflectionSupport.java

@@ -40,12 +40,11 @@
  */
 package org.graalvm.nativeimage.impl;
 
-import org.graalvm.nativeimage.hosted.InclusionCondition;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import org.graalvm.nativeimage.hosted.InclusionCondition;
 import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
 import org.graalvm.nativeimage.hosted.RuntimeProxyCreation;
 
@@ -57,8 +56,12 @@ public interface RuntimeReflectionSupport extends ReflectionRegistry {
 
     void registerAllFields(InclusionCondition condition, Class<?> clazz);
 
+    void registerAllFieldsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz);
+
     void registerAllDeclaredFields(InclusionCondition condition, Class<?> clazz);
 
+    void registerAllDeclaredFieldsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz);
+
     void registerAllConstructorsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz);
 
     void registerAllDeclaredConstructorsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/InternalReflectionDynamicAccessImpl.java

@@ -29,7 +29,9 @@ public void register(InclusionCondition condition, Class<?>... classes) {
             rrsInstance.registerAllDeclaredMethodsQuery(condition, true, clazz);
             rrsInstance.registerAllMethodsQuery(condition, true, clazz);
             rrsInstance.registerAllDeclaredConstructorsQuery(condition, true, clazz);
-            rrsInstance.registerAllFields(condition, clazz);
+            rrsInstance.registerAllConstructorsQuery(condition, true, clazz);
+            rrsInstance.registerAllFieldsQuery(condition, true, clazz);
+            rrsInstance.registerAllDeclaredFieldsQuery(condition, true, clazz);
             rrsInstance.registerAllNestMembersQuery(condition, clazz);
             rrsInstance.registerAllPermittedSubclassesQuery(condition, clazz);
             rrsInstance.registerAllRecordComponentsQuery(condition, clazz);
@@ -62,14 +64,4 @@ public void registerForSerialization(InclusionCondition condition, Class<?>... c
     public void registerForJNIAccess(InclusionCondition condition, Class<?>... classes) {
         rrjInstance.register(condition, classes);
     }
-
-    @Override
-    public void registerForJNIAccess(InclusionCondition condition, Executable... methods) {
-        rrjInstance.register(condition, false, methods);
-    }
-
-    @Override
-    public void registerForJNIAccess(InclusionCondition condition, Field... fields) {
-        rrjInstance.register(condition, false, fields);
-    }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ReflectionDynamicAccessImpl.java

@@ -68,20 +68,6 @@ public void registerForSerialization(InclusionCondition condition, Class<?>... c
     public void registerForJNIAccess(InclusionCondition condition, Class<?>... classes) {
         UserError.guarantee(!afterRegistrationFinished, "There shouldn't be a registration for runtime access after afterRegistration period. You tried to register: %s",
                         Arrays.toString(classes));
-        rdaInstance.register(condition, classes);
-    }
-
-    @Override
-    public void registerForJNIAccess(InclusionCondition condition, Executable... methods) {
-        UserError.guarantee(!afterRegistrationFinished, "There shouldn't be a registration for runtime access after afterRegistration period. You tried to register: %s",
-                        Arrays.toString(methods));
-        rdaInstance.registerForJNIAccess(condition, methods);
-    }
-
-    @Override
-    public void registerForJNIAccess(InclusionCondition condition, Field... fields) {
-        UserError.guarantee(!afterRegistrationFinished, "There shouldn't be a registration for runtime access after afterRegistration period. You tried to register: %s",
-                        Arrays.toString(fields));
-        rdaInstance.registerForJNIAccess(condition, fields);
+        rdaInstance.registerForJNIAccess(condition, classes);
     }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java

@@ -52,6 +52,7 @@
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.InclusionCondition;
 import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
+import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
 import org.graalvm.word.PointerBase;
 
 import com.oracle.graal.pointsto.BigBang;
@@ -103,6 +104,7 @@
 import com.oracle.svm.hosted.meta.KnownOffsetsFeature;
 import com.oracle.svm.hosted.meta.MaterializedConstantFields;
 import com.oracle.svm.hosted.reflect.NativeImageConditionResolver;
+import com.oracle.svm.hosted.reflect.ReflectionDataBuilder;
 import com.oracle.svm.hosted.reflect.proxy.DynamicProxyFeature;
 import com.oracle.svm.hosted.substitute.SubstitutionReflectivityFilter;
 import com.oracle.svm.util.ReflectionUtil;
@@ -226,7 +228,22 @@ public void register(InclusionCondition condition, boolean unsafeAllocated, Clas
             assert !unsafeAllocated : "unsafeAllocated can be only set via Unsafe.allocateInstance, not via JNI.";
             Objects.requireNonNull(clazz, () -> nullErrorMessage("class"));
             abortIfSealed();
-            registerConditionalConfiguration(condition, (cnd) -> newClasses.add(clazz));
+            registerConditionalConfiguration(condition, (cnd) -> {
+                newClasses.add(clazz);
+                /*
+                 * All methods and fields that are registered for reflection, must be registered for
+                 * JNI access if declaring type is JNI accessible
+                 */
+                Executable[] executables = ((ReflectionDataBuilder) ImageSingletons.lookup(RuntimeReflectionSupport.class)).getNotQueriedOnlyExecutables(clazz);
+                if (executables.length > 0) {
+                    register(cnd, false, executables);
+                }
+
+                Field[] fields = ((ReflectionDataBuilder) ImageSingletons.lookup(RuntimeReflectionSupport.class)).getReflectiveAccessibleFields(clazz);
+                if (fields.length > 0) {
+                    register(cnd, false, fields);
+                }
+            });
         }
 
         @Override
@@ -525,6 +542,18 @@ private static void addNegativeFieldLookup(Class<?> declaringClass, String field
         jniClass.addFieldIfAbsent(fieldName, d -> JNIAccessibleField.negativeFieldQuery(jniClass));
     }
 
+    public Set<Class<?>> getJNIAccessibleTypes() {
+        return newClasses;
+    }
+
+    public Set<Executable> getJNIAccessibleMethods() {
+        return newMethods;
+    }
+
+    public Set<Field> getJNIAccessibleFields() {
+        return newFields.keySet();
+    }
+
     @Override
     @SuppressWarnings("unused")
     public void afterAnalysis(AfterAnalysisAccess access) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -70,6 +70,7 @@
 import org.graalvm.nativeimage.hosted.InclusionCondition;
 import org.graalvm.nativeimage.hosted.RuntimeProxyCreation;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
+import org.graalvm.nativeimage.impl.RuntimeJNIAccessSupport;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
 
 import com.oracle.graal.pointsto.ObjectScanner.ScanReason;
@@ -94,6 +95,7 @@
 import com.oracle.svm.hosted.annotation.AnnotationValue;
 import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtractor;
 import com.oracle.svm.hosted.annotation.TypeAnnotationValue;
+import com.oracle.svm.hosted.jni.JNIAccessFeature;
 import com.oracle.svm.hosted.substitute.SubstitutionReflectivityFilter;
 import com.oracle.svm.util.LogUtils;
 import com.oracle.svm.util.ReflectionUtil;
@@ -121,6 +123,7 @@ public class ReflectionDataBuilder extends ConditionalConfigurationRegistry impl
     private final Map<Class<?>, Set<Class<?>>> innerClasses = new ConcurrentHashMap<>();
     private final Map<Class<?>, Integer> enabledQueriesFlags = new ConcurrentHashMap<>();
     private final Map<AnalysisType, Map<AnalysisField, ConditionalRuntimeValue<Field>>> registeredFields = new ConcurrentHashMap<>();
+    private final Set<Field> reflectiveAccessibleFields = new HashSet<>();
     private final Set<AnalysisField> hidingFields = ConcurrentHashMap.newKeySet();
     private final Map<AnalysisType, Map<AnalysisMethod, ConditionalRuntimeValue<Executable>>> registeredMethods = new ConcurrentHashMap<>();
     private final Map<AnalysisMethod, Object> methodAccessors = new ConcurrentHashMap<>();
@@ -471,6 +474,16 @@ private void registerMethod(InclusionCondition cnd, boolean queriedOnly, Executa
                 return accessor;
             });
         }
+        /*
+         * We must register method that isn't registered as queriedOnly, as JNI accessible if it
+         * isn't already.
+         */
+        Set<Executable> JNIAccessibleMethods = JNIAccessFeature.singleton().getJNIAccessibleMethods();
+        Set<Class<?>> JNIAccessibleClasses = JNIAccessFeature.singleton().getJNIAccessibleTypes();
+
+        if (!JNIAccessibleMethods.contains(reflectExecutable) && JNIAccessibleClasses.contains(declaringType.getJavaClass()) && !queriedOnly) {
+            ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(cnd, false, reflectExecutable);
+        }
     }
 
     @Override
@@ -512,6 +525,7 @@ public void registerAllFields(InclusionCondition condition, Class<?> clazz) {
         registerAllFieldsQuery(condition, false, clazz);
     }
 
+    @Override
     public void registerAllFieldsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz) {
         runConditionalInAnalysisTask(condition, (cnd) -> {
             for (Class<?> current = clazz; current != null; current = current.getSuperclass()) {
@@ -530,6 +544,7 @@ public void registerAllDeclaredFields(InclusionCondition condition, Class<?> cla
         registerAllDeclaredFieldsQuery(condition, false, clazz);
     }
 
+    @Override
     public void registerAllDeclaredFieldsQuery(InclusionCondition condition, boolean queriedOnly, Class<?> clazz) {
         runConditionalInAnalysisTask(condition, (cnd) -> {
             setQueryFlag(clazz, ALL_DECLARED_FIELDS_FLAG);
@@ -595,6 +610,14 @@ private void registerField(InclusionCondition cnd, boolean queriedOnly, Field re
             /* queryOnly methods are conditioned on the type itself */
             cndValue.getConditions().addCondition(cnd);
             registerTypesForField(analysisField, reflectField, false);
+            reflectiveAccessibleFields.add(reflectField);
+        }
+
+        Set<Field> JNIAccessibleFields = JNIAccessFeature.singleton().getJNIAccessibleFields();
+        Set<Class<?>> JNIAccessibleClasses = JNIAccessFeature.singleton().getJNIAccessibleTypes();
+
+        if (!JNIAccessibleFields.contains(reflectField) && JNIAccessibleClasses.contains(declaringClass.getJavaClass()) && !queriedOnly) {
+            ImageSingletons.lookup(RuntimeJNIAccessSupport.class).register(cnd, false, reflectField);
         }
     }
 
@@ -1151,6 +1174,15 @@ public Object getAccessor(AnalysisMethod method) {
         return methodAccessors.get(method);
     }
 
+    public Executable[] getNotQueriedOnlyExecutables(Class<?> declaringType) {
+        return methodAccessors.keySet().stream().filter(analysisMethod -> analysisMethod.getDeclaringClass().getJavaClass().equals(declaringType)).map(AnalysisMethod::getJavaMethod)
+                        .collect(Collectors.toSet()).toArray(new Executable[0]);
+    }
+
+    public Field[] getReflectiveAccessibleFields(Class<?> declaringType) {
+        return reflectiveAccessibleFields.stream().filter(field -> field.getDeclaringClass().equals(declaringType)).collect(Collectors.toSet()).toArray(new Field[0]);
+    }
+
     @Override
     public Set<ResolvedJavaField> getHidingReflectionFields() {
         assert sealed;