svm: implement core reflection based JNIRegistrationUtil with JVCMI methods

Author: zapster

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JNIRegistrationUtil.java

@@ -24,27 +24,28 @@
  */
 package com.oracle.svm.core.jdk;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.hosted.Feature.AfterAnalysisAccess;
 import org.graalvm.nativeimage.hosted.Feature.DuringAnalysisAccess;
 import org.graalvm.nativeimage.hosted.Feature.FeatureAccess;
-import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
-import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.InternalPlatform;
-import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
+import com.oracle.svm.core.feature.InternalFeature.InternalFeatureAccess;
 import com.oracle.svm.core.util.ConcurrentIdentityHashMap;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.util.ReflectionUtil;
+import com.oracle.svm.util.JVMCIReflectionUtil;
+import com.oracle.svm.util.JVMCIRuntimeClassInitializationSupport;
+import com.oracle.svm.util.dynamicaccess.JVMCIRuntimeJNIAccess;
+import com.oracle.svm.util.dynamicaccess.JVMCIRuntimeReflection;
+
+import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * Utility methods used by features that perform JNI registration.
@@ -72,52 +73,55 @@ protected static boolean isWindows() {
     }
 
     protected static void initializeAtRunTime(FeatureAccess access, String... classNames) {
-        RuntimeClassInitializationSupport classInitSupport = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
+        InternalFeatureAccess internalAccess = (InternalFeatureAccess) access;
+        JVMCIRuntimeClassInitializationSupport classInitSupport = JVMCIRuntimeClassInitializationSupport.singleton();
         for (String className : classNames) {
-            classInitSupport.initializeAtRunTime(clazz(access, className), "for JDK native code support via JNI");
+            classInitSupport.initializeAtRunTime(type(internalAccess, className), "for JDK native code support via JNI");
         }
     }
 
-    protected static Class<?> clazz(FeatureAccess access, String className) {
-        Class<?> classByName = access.findClassByName(className);
-        VMError.guarantee(classByName != null, "class %s not found", className);
-        return classByName;
+    protected static ResolvedJavaType type(FeatureAccess access, String className) {
+        ResolvedJavaType typeByName = ((InternalFeatureAccess) access).findTypeByName(className);
+        VMError.guarantee(typeByName != null, "class %s not found", className);
+        return typeByName;
     }
 
-    protected static Optional<Class<?>> optionalClazz(FeatureAccess access, String className) {
-        Class<?> classByName = access.findClassByName(className);
-        return Optional.ofNullable(classByName);
+    protected static Optional<? extends ResolvedJavaType> optionalType(FeatureAccess access, String className) {
+        ResolvedJavaType typeByName = ((InternalFeatureAccess) access).findTypeByName(className);
+        return Optional.ofNullable(typeByName);
     }
 
-    protected static Optional<Method> optionalMethod(FeatureAccess access, String className, String methodName, Class<?>... parameterTypes) {
-        return optionalClazz(access, className)
-                        .flatMap(clazz -> Optional.ofNullable(ReflectionUtil.lookupMethod(true, clazz, methodName, parameterTypes)));
+    protected static Optional<ResolvedJavaMethod> optionalMethod(FeatureAccess access, String className, String methodName, Class<?>... parameterTypes) {
+        InternalFeatureAccess internalAccess = (InternalFeatureAccess) access;
+        return optionalType(access, className)
+                        .flatMap(clazz -> Optional.ofNullable(JVMCIReflectionUtil.getUniqueDeclaredMethod(true, internalAccess.getMetaAccess(), clazz, methodName, parameterTypes)));
     }
 
-    protected static Method method(FeatureAccess access, String className, String methodName, Class<?>... parameterTypes) {
-        return ReflectionUtil.lookupMethod(clazz(access, className), methodName, parameterTypes);
+    protected static ResolvedJavaMethod method(FeatureAccess access, String className, String methodName, Class<?>... parameterTypes) {
+        return JVMCIReflectionUtil.getUniqueDeclaredMethod(((InternalFeatureAccess) access).getMetaAccess(), type(access, className), methodName, parameterTypes);
     }
 
-    protected static Constructor<?> constructor(FeatureAccess access, String className, Class<?>... parameterTypes) {
-        return ReflectionUtil.lookupConstructor(clazz(access, className), parameterTypes);
+    protected static ResolvedJavaMethod constructor(FeatureAccess access, String className, Class<?>... parameterTypes) {
+        return JVMCIReflectionUtil.getDeclaredConstructor(((InternalFeatureAccess) access).getMetaAccess(), type(access, className), parameterTypes);
     }
 
-    protected static Field[] fields(FeatureAccess access, String className, String... fieldNames) {
-        Class<?> clazz = clazz(access, className);
-        Field[] result = new Field[fieldNames.length];
+    protected static ResolvedJavaField[] fields(FeatureAccess access, String className, String... fieldNames) {
+        ResolvedJavaType type = type(access, className);
+        ResolvedJavaField[] result = new ResolvedJavaField[fieldNames.length];
         for (int i = 0; i < fieldNames.length; i++) {
-            result[i] = ReflectionUtil.lookupField(clazz, fieldNames[i]);
+            result[i] = JVMCIReflectionUtil.getUniqueDeclaredField(type, fieldNames[i]);
         }
         return result;
     }
 
     protected static void registerForThrowNew(FeatureAccess access, String... exceptionClassNames) {
+        InternalFeatureAccess internalAccess = (InternalFeatureAccess) access;
         for (String exceptionClassName : exceptionClassNames) {
-            RuntimeJNIAccess.register(clazz(access, exceptionClassName));
-            RuntimeJNIAccess.register(constructor(access, exceptionClassName, String.class));
+            JVMCIRuntimeJNIAccess.register(type(internalAccess, exceptionClassName));
+            JVMCIRuntimeJNIAccess.register(constructor(internalAccess, exceptionClassName, String.class));
 
-            RuntimeReflection.register(clazz(access, exceptionClassName));
-            RuntimeReflection.register(constructor(access, exceptionClassName, String.class));
+            JVMCIRuntimeReflection.register(type(internalAccess, exceptionClassName));
+            JVMCIRuntimeReflection.register(constructor(internalAccess, exceptionClassName, String.class));
         }
     }
 

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

@@ -84,7 +84,6 @@
 import javax.security.auth.login.Configuration;
 
 import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.hosted.RuntimeJNIAccess;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 
@@ -113,13 +112,17 @@
 import com.oracle.svm.hosted.c.NativeLibraries;
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 import com.oracle.svm.util.JVMCIReflectionUtil;
+import com.oracle.svm.util.JVMCIRuntimeClassInitializationSupport;
 import com.oracle.svm.util.ModuleSupport;
+import com.oracle.svm.util.OriginalMethodProvider;
 import com.oracle.svm.util.ReflectionUtil;
 import com.oracle.svm.util.TypeResult;
+import com.oracle.svm.util.dynamicaccess.JVMCIRuntimeJNIAccess;
 
 import jdk.graal.compiler.debug.Assertions;
 import jdk.graal.compiler.options.Option;
 import jdk.internal.access.SharedSecrets;
+import jdk.vm.ci.meta.ResolvedJavaMethod;
 import sun.security.jca.ProviderList;
 import sun.security.provider.NativePRNG;
 import sun.security.x509.OIDMap;
@@ -269,7 +272,7 @@ public void afterRegistration(AfterRegistrationAccess a) {
     @Override
     public void duringSetup(DuringSetupAccess a) {
         DuringSetupAccessImpl access = (DuringSetupAccessImpl) a;
-        RuntimeClassInitializationSupport rci = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
+        JVMCIRuntimeClassInitializationSupport rci = JVMCIRuntimeClassInitializationSupport.singleton();
         oidTableField = access.findField("sun.security.util.ObjectIdentifier", "oidTable");
         oidMapField = access.findField(OIDMap.class, "oidMap");
         if (!FutureDefaultsOptions.securityProvidersInitializedAtRunTime()) {
@@ -281,8 +284,8 @@ public void duringSetup(DuringSetupAccess a) {
         } else {
             SecurityProvidersSupport support = SecurityProvidersSupport.singleton();
             ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, SecuritySubstitutions.class, false, "java.base", "sun.security.ec");
-            Constructor<?> sunECConstructor = constructor(a, "sun.security.ec.SunEC");
-            support.setSunECConstructor(sunECConstructor);
+            ResolvedJavaMethod sunECConstructor = constructor(a, "sun.security.ec.SunEC");
+            support.setSunECConstructor((Constructor<?>) OriginalMethodProvider.getJavaMethod(sunECConstructor));
 
             Properties securityProperties = SharedSecrets.getJavaSecurityPropertiesAccess().getInitialProperties();
             support.setSavedInitialSecurityProperties(securityProperties);
@@ -306,44 +309,44 @@ public void duringSetup(DuringSetupAccess a) {
         rci.initializeAtRunTime(NativePRNG.Blocking.class, "for substitutions");
         rci.initializeAtRunTime(NativePRNG.NonBlocking.class, "for substitutions");
 
-        rci.initializeAtRunTime(clazz(access, "sun.security.provider.SeedGenerator"), "for substitutions");
-        rci.initializeAtRunTime(clazz(access, "sun.security.provider.SecureRandom$SeederHolder"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "sun.security.provider.SeedGenerator"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "sun.security.provider.SecureRandom$SeederHolder"), "for substitutions");
 
         /*
          * sun.security.provider.AbstractDrbg$SeederHolder has a static final EntropySource seeder
          * field that needs to be initialized at run time because it captures the result of
          * SeedGenerator.getSystemEntropy().
          */
-        rci.initializeAtRunTime(clazz(access, "sun.security.provider.AbstractDrbg$SeederHolder"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "sun.security.provider.AbstractDrbg$SeederHolder"), "for substitutions");
         if (isMscapiModulePresent) {
             /* PRNG.<clinit> creates a Cleaner (see JDK-8210476), which starts its thread. */
-            rci.initializeAtRunTime(clazz(access, "sun.security.mscapi.PRNG"), "for substitutions");
+            rci.initializeAtRunTime(type(access, "sun.security.mscapi.PRNG"), "for substitutions");
         }
-        rci.initializeAtRunTime(clazz(access, "sun.security.provider.FileInputStreamPool"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "sun.security.provider.FileInputStreamPool"), "for substitutions");
         /* java.util.UUID$Holder has a static final SecureRandom field. */
-        rci.initializeAtRunTime(clazz(access, "java.util.UUID$Holder"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "java.util.UUID$Holder"), "for substitutions");
 
         /* The classes below have a static final SecureRandom field. */
-        rci.initializeAtRunTime(clazz(access, "sun.security.jca.JCAUtil$CachedSecureRandomHolder"), "for substitutions");
-        rci.initializeAtRunTime(clazz(access, "com.sun.crypto.provider.SunJCE$SecureRandomHolder"), "for substitutions");
-        optionalClazz(access, "sun.security.krb5.Confounder").ifPresent(clazz -> rci.initializeAtRunTime(clazz, "for substitutions"));
-        optionalClazz(access, "sun.security.krb5.Config").ifPresent(clazz -> rci.initializeAtRunTime(clazz, "Reset the value of lazily initialized field sun.security.krb5.Config#singleton"));
+        rci.initializeAtRunTime(type(access, "sun.security.jca.JCAUtil$CachedSecureRandomHolder"), "for substitutions");
+        rci.initializeAtRunTime(type(access, "com.sun.crypto.provider.SunJCE$SecureRandomHolder"), "for substitutions");
+        optionalType(access, "sun.security.krb5.Confounder").ifPresent(clazz -> rci.initializeAtRunTime(clazz, "for substitutions"));
+        optionalType(access, "sun.security.krb5.Config").ifPresent(clazz -> rci.initializeAtRunTime(clazz, "Reset the value of lazily initialized field sun.security.krb5.Config#singleton"));
 
-        rci.initializeAtRunTime(clazz(access, "sun.security.jca.JCAUtil"), "JCAUtil.def holds a SecureRandom.");
+        rci.initializeAtRunTime(type(access, "sun.security.jca.JCAUtil"), "JCAUtil.def holds a SecureRandom.");
 
         /*
          * When SSLContextImpl$DefaultManagersHolder sets-up the TrustManager in its initializer it
          * gets the value of the -Djavax.net.ssl.trustStore and -Djavax.net.ssl.trustStorePassword
          * properties from the build machine. Running its initialization at run time is required to
          * use the run time provided values.
          */
-        rci.initializeAtRunTime(clazz(access, "sun.security.ssl.SSLContextImpl$DefaultManagersHolder"), "for reading properties at run time");
+        rci.initializeAtRunTime(type(access, "sun.security.ssl.SSLContextImpl$DefaultManagersHolder"), "for reading properties at run time");
 
         /*
          * SSL debug logging enabled by javax.net.debug system property is set up during the class
          * initialization.
          */
-        rci.initializeAtRunTime(clazz(access, "sun.security.ssl.SSLLogger"), "for reading properties at run time");
+        rci.initializeAtRunTime(type(access, "sun.security.ssl.SSLLogger"), "for reading properties at run time");
     }
 
     @Override
@@ -381,7 +384,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         }
 
         if (isPosix()) {
-            Optional<Method> optMethodGetUnixInfo = optionalMethod(access, "com.sun.security.auth.module.UnixSystem", "getUnixInfo");
+            Optional<ResolvedJavaMethod> optMethodGetUnixInfo = optionalMethod(access, "com.sun.security.auth.module.UnixSystem", "getUnixInfo");
             optMethodGetUnixInfo.ifPresent(m -> {
                 access.registerReachabilityHandler(SecurityServicesFeature::linkJaas, m);
                 /* Resolve calls to com_sun_security_auth_module_UnixSystem* as builtIn. */
@@ -390,7 +393,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
         }
 
         if (isMscapiModulePresent) {
-            access.registerReachabilityHandler(SecurityServicesFeature::registerSunMSCAPIConfig, clazz(access, "sun.security.mscapi.SunMSCAPI"));
+            access.registerReachabilityHandler(SecurityServicesFeature::registerSunMSCAPIConfig, type(access, "sun.security.mscapi.SunMSCAPI"));
             /* Resolve calls to sun_security_mscapi* as builtIn. */
             PlatformNativeLibrarySupport.singleton().addBuiltinPkgNativePrefix("sun_security_mscapi");
         }
@@ -544,26 +547,26 @@ private static void registerSunMSCAPIConfig(BeforeAnalysisAccess a) {
     }
 
     private static void registerLoadKeysOrCertificateChains(DuringAnalysisAccess a) {
-        RuntimeJNIAccess.register(constructor(a, "java.util.ArrayList"));
-        RuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateCertificate", byte[].class, Collection.class));
-        RuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateCertificateChain", String.class, Collection.class));
-        RuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateKeyAndCertificateChain", boolean.class, String.class, long.class, long.class, int.class, Collection.class));
+        JVMCIRuntimeJNIAccess.register(constructor(a, "java.util.ArrayList"));
+        JVMCIRuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateCertificate", byte[].class, Collection.class));
+        JVMCIRuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateCertificateChain", String.class, Collection.class));
+        JVMCIRuntimeJNIAccess.register(method(a, "sun.security.mscapi.CKeyStore", "generateKeyAndCertificateChain", boolean.class, String.class, long.class, long.class, int.class, Collection.class));
     }
 
     private static void registerGenerateCKeyPair(DuringAnalysisAccess a) {
-        RuntimeJNIAccess.register(constructor(a, "sun.security.mscapi.CKeyPair", String.class, long.class, long.class, int.class));
+        JVMCIRuntimeJNIAccess.register(constructor(a, "sun.security.mscapi.CKeyPair", String.class, long.class, long.class, int.class));
     }
 
     private static void registerCPrivateKeyOf(DuringAnalysisAccess a) {
-        RuntimeJNIAccess.register(method(a, "sun.security.mscapi.CPrivateKey", "of", String.class, long.class, long.class, int.class));
+        JVMCIRuntimeJNIAccess.register(method(a, "sun.security.mscapi.CPrivateKey", "of", String.class, long.class, long.class, int.class));
     }
 
     private static void registerCPublicKeyOf(DuringAnalysisAccess a) {
-        RuntimeJNIAccess.register(method(a, "sun.security.mscapi.CPublicKey", "of", String.class, long.class, long.class, int.class));
+        JVMCIRuntimeJNIAccess.register(method(a, "sun.security.mscapi.CPublicKey", "of", String.class, long.class, long.class, int.class));
     }
 
     private static void linkJaas(DuringAnalysisAccess a) {
-        RuntimeJNIAccess.register(fields(a, "com.sun.security.auth.module.UnixSystem", "username", "uid", "gid", "groups"));
+        JVMCIRuntimeJNIAccess.register(fields(a, "com.sun.security.auth.module.UnixSystem", "username", "uid", "gid", "groups"));
 
         NativeLibraries nativeLibraries = ((DuringAnalysisAccessImpl) a).getNativeLibraries();
         /* We can statically link jaas, thus we classify it as builtIn library */
@@ -657,8 +660,8 @@ private void registerServiceReachabilityHandlers(BeforeAnalysisAccess access) {
          * java.security.Provider.Service.newInstance() directly. On Open JDK
          * SecureRandom.getInstance() is used instead.
          */
-        Optional<Method> defaultSecureRandomService = optionalMethod(access, "java.security.Provider", "getDefaultSecureRandomService");
-        defaultSecureRandomService.ifPresent(m -> access.registerMethodOverrideReachabilityHandler((a, t) -> registerServices(a, t, SECURE_RANDOM_SERVICE), m));
+        Optional<ResolvedJavaMethod> defaultSecureRandomService = optionalMethod(access, "java.security.Provider", "getDefaultSecureRandomService");
+        defaultSecureRandomService.ifPresent(m -> access.registerMethodOverrideReachabilityHandler((a, t) -> registerServices(a, t, SECURE_RANDOM_SERVICE), OriginalMethodProvider.getJavaMethod(m)));
     }
 
     private void registerServices(DuringAnalysisAccess access, Object trigger, Class<?> serviceClass) {