Ensure classes from system modules are excluded from ReflectionInvocationCheck

Author: olpaw

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

@@ -46,6 +46,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.AfterAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.BeforeAnalysisAccessImpl;
+import com.oracle.svm.util.ModuleSupport;
 
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -62,6 +63,8 @@ public class FallbackFeature implements Feature {
     private final List<String> proxyCalls = new ArrayList<>();
     private final List<String> serializationCalls = new ArrayList<>();
 
+    private final Set<Object> systemModuleDescriptors = ModuleSupport.getSystemModuleDescriptors();
+
     private static class AutoProxyInvoke {
         private final ResolvedJavaMethod method;
         private final int bci;
@@ -103,7 +106,7 @@ private interface InvokeChecker {
         void check(ReflectionInvocationCheck check, BytecodePosition invokeLocation);
     }
 
-    private static class ReflectionInvocationCheck {
+    private class ReflectionInvocationCheck {
         private final Method reflectionMethod;
         private final InvokeChecker checker;
         private AnalysisMethod trackedReflectionMethod;
@@ -120,10 +123,15 @@ void trackMethod(AnalysisMetaAccess metaAccess) {
         }
 
         void apply(BytecodePosition invokeLocation) {
-            ClassLoader classLoader = ((AnalysisMethod) invokeLocation.getMethod()).getDeclaringClass().getJavaClass().getClassLoader();
-            if (NativeImageSystemClassLoader.singleton().isNativeImageClassLoader(classLoader)) {
-                checker.check(this, invokeLocation);
+            Class<?> javaClass = ((AnalysisMethod) invokeLocation.getMethod()).getDeclaringClass().getJavaClass();
+            if (systemModuleDescriptors.contains(ModuleSupport.getModuleDescriptor(javaClass))) {
+                return;
+            }
+            ClassLoader classLoader = javaClass.getClassLoader();
+            if (!NativeImageSystemClassLoader.singleton().isNativeImageClassLoader(classLoader)) {
+                return;
             }
+            checker.check(this, invokeLocation);
         }
 
         String locationString(BytecodePosition invokeLocation) {

substratevm/src/com.oracle.svm.util.jdk11/src/com/oracle/svm/util/ModuleSupport.java

@@ -24,9 +24,12 @@
  */
 package com.oracle.svm.util;
 
+import java.lang.module.ModuleFinder;
+import java.lang.module.ModuleReference;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -124,4 +127,14 @@ public static void exportAndOpenPackageToUnnamed(String name, String pkg, boolea
     public static String getModuleName(Class<?> clazz) {
         return clazz.getModule().getName();
     }
+
+    public static Object getModuleDescriptor(Class<?> clazz) {
+        return clazz.getModule().getDescriptor();
+    }
+
+    public static Set<Object> getSystemModuleDescriptors() {
+        return ModuleFinder.ofSystem().findAll().stream()
+                        .map(ModuleReference::descriptor)
+                        .collect(Collectors.toSet());
+    }
 }

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/ModuleSupport.java

@@ -24,7 +24,9 @@
  */
 package com.oracle.svm.util;
 
+import java.util.Collections;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
@@ -86,4 +88,14 @@ public static String getModuleName(Class<?> clazz) {
         assert JavaVersionUtil.JAVA_SPEC <= 8;
         return null;
     }
+
+    public static Object getModuleDescriptor(Class<?> clazz) {
+        assert JavaVersionUtil.JAVA_SPEC <= 8;
+        return null;
+    }
+
+    public static Set<Object> getSystemModuleDescriptors() {
+        assert JavaVersionUtil.JAVA_SPEC <= 8;
+        return Collections.emptySet();
+    }
 }