Register Object methods for reflective queries

Author: loicottet

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

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.reflect.target;
 
+import static com.oracle.svm.core.MissingRegistrationUtils.throwMissingRegistrationErrors;
+
 import java.lang.reflect.Executable;
 
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
@@ -48,6 +50,14 @@ public Object transform(Object receiver, Object originalValue) {
              */
             return originalValue;
         }
-        return ReflectionSubstitutionSupport.singleton().getOrCreateAccessor((Executable) receiver);
+        if (throwMissingRegistrationErrors()) {
+            /*
+             * We do not want to register a heap executable which wasn't explicitly registered for
+             * reflection.
+             */
+            return ReflectionSubstitutionSupport.singleton().getAccessor((Executable) receiver);
+        } else {
+            return ReflectionSubstitutionSupport.singleton().getOrCreateAccessor((Executable) receiver);
+        }
     }
 }

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

@@ -39,6 +39,8 @@ static ReflectionSubstitutionSupport singleton() {
         return ImageSingletons.lookup(ReflectionSubstitutionSupport.class);
     }
 
+    SubstrateAccessor getAccessor(Executable member);
+
     SubstrateAccessor getOrCreateAccessor(Executable member);
 
     SubstrateAccessor getOrCreateConstructorAccessor(Class<?> targetClass, Executable member);

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

@@ -226,6 +226,21 @@ public void registerAllClassesQuery(ConfigurationCondition condition, Class<?> c
         });
     }
 
+    void registerClassMetadata(ConfigurationCondition condition, Class<?> clazz) {
+        registerAllDeclaredFieldsQuery(condition, true, clazz);
+        registerAllFieldsQuery(condition, true, clazz);
+        registerAllDeclaredMethodsQuery(condition, true, clazz);
+        registerAllMethodsQuery(condition, true, clazz);
+        registerAllDeclaredConstructorsQuery(condition, true, clazz);
+        registerAllConstructorsQuery(condition, true, clazz);
+        registerAllDeclaredClassesQuery(condition, clazz);
+        registerAllClassesQuery(condition, clazz);
+        registerAllRecordComponentsQuery(condition, clazz);
+        registerAllPermittedSubclassesQuery(condition, clazz);
+        registerAllNestMembersQuery(condition, clazz);
+        registerAllSignersQuery(condition, clazz);
+    }
+
     /**
      * Runtime conditions can only be used with type, so they are not valid here.
      */
@@ -1161,10 +1176,10 @@ public Map<Class<?>, Set<Class<?>>> getReflectionInnerClasses() {
     public int getEnabledReflectionQueries(Class<?> clazz) {
         int enabledQueries = enabledQueriesFlags.getOrDefault(clazz, 0);
         /*
-         * Primitives, arrays and object are registered by default since they provide reflective
-         * access to either no members or only Object methods.
+         * Primitives and arrays are registered by default since they provide reflective access to
+         * no members.
          */
-        if (clazz == Object.class || clazz.isPrimitive() || clazz.isArray()) {
+        if (clazz.isPrimitive() || clazz.isArray()) {
             enabledQueries |= ALL_DECLARED_CLASSES_FLAG | ALL_CLASSES_FLAG | ALL_DECLARED_CONSTRUCTORS_FLAG | ALL_CONSTRUCTORS_FLAG | ALL_DECLARED_METHODS_FLAG | ALL_METHODS_FLAG |
                             ALL_DECLARED_FIELDS_FLAG | ALL_FIELDS_FLAG;
         }

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

@@ -143,6 +143,11 @@ private record AccessorKey(Executable member, Class<?> targetClass) {
 
     FeatureImpl.BeforeAnalysisAccessImpl analysisAccess;
 
+    @Override
+    public SubstrateAccessor getAccessor(Executable member) {
+        return accessors.get(new AccessorKey(member, member.getDeclaringClass()));
+    }
+
     @Override
     public SubstrateAccessor getOrCreateAccessor(Executable member) {
         return getOrCreateConstructorAccessor(member.getDeclaringClass(), member);
@@ -295,6 +300,12 @@ public void afterRegistration(AfterRegistrationAccess access) {
         reflectionData = new ReflectionDataBuilder((SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class));
         ImageSingletons.add(RuntimeReflectionSupport.class, reflectionData);
         ImageSingletons.add(ReflectionHostedSupport.class, reflectionData);
+
+        /*
+         * Querying Object members is allowed to enable these accesses on array classes, since those
+         * don't define any additional members.
+         */
+        reflectionData.registerClassMetadata(ConfigurationCondition.alwaysTrue(), Object.class);
     }
 
     @Override