svm: migrate to HostModuleUtil#addReads

Author: zapster

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSubstitutions.java

@@ -43,6 +43,7 @@
 import com.oracle.svm.core.posix.PosixUtils;
 import com.oracle.svm.core.posix.headers.darwin.DarwinTime;
 import com.oracle.svm.core.util.BasedOnJDKFile;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 import jdk.internal.misc.Unsafe;
 
@@ -138,7 +139,7 @@ final class Target_java_util_prefs_FileSystemPreferences {
 final class IsJavaUtilPrefsPresent implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
-        var prefsMod = ModuleLayer.boot().findModule("java.prefs");
+        var prefsMod = ResolvedJavaModuleLayer.boot().findModule("java.prefs");
         return prefsMod.isPresent();
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java

@@ -81,6 +81,7 @@
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.LogUtils;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 import jdk.graal.compiler.api.replacements.Fold;
 import jdk.graal.compiler.asm.amd64.AMD64Assembler;
@@ -975,7 +976,7 @@ public static boolean hasFramePointer() {
         @Override
         protected void onValueUpdate(EconomicMap<OptionKey<?>, Object> values, String oldValue, String newValue) {
             if ("llvm".equals(newValue)) {
-                boolean isLLVMBackendMissing = ModuleLayer.boot().findModule("org.graalvm.nativeimage.llvm").isEmpty();
+                boolean isLLVMBackendMissing = ResolvedJavaModuleLayer.boot().findModule("org.graalvm.nativeimage.llvm").isEmpty();
                 if (isLLVMBackendMissing) {
                     throw UserError.invalidOptionValue(CompilerBackend, newValue,
                                     "The LLVM backend for GraalVM Native Image is missing and needs to be built from source. " +

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

@@ -38,13 +38,16 @@
 import com.oracle.svm.core.traits.BuiltinTraits.NoLayeredCallbacks;
 import com.oracle.svm.core.traits.SingletonLayeredInstallationKind.Independent;
 import com.oracle.svm.core.traits.SingletonTraits;
+import com.oracle.svm.util.HostModuleUtil;
+import com.oracle.svm.util.ResolvedJavaModule;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 @AutomaticallyRegisteredFeature
 @SingletonTraits(access = BuildtimeAccessOnly.class, layeredCallbacks = NoLayeredCallbacks.class, layeredInstallationKind = Independent.class)
 public class JavaNetHttpFeature extends JNIRegistrationUtil implements InternalFeature {
 
-    private static Optional<Module> requiredModule() {
-        return ModuleLayer.boot().findModule("java.net.http");
+    private static Optional<ResolvedJavaModule> requiredModule() {
+        return ResolvedJavaModuleLayer.boot().findModule("java.net.http");
     }
 
     @Override
@@ -54,7 +57,7 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        JavaNetHttpFeature.class.getModule().addReads(requiredModule().get());
+        HostModuleUtil.addReads(JavaNetHttpFeature.class, requiredModule().get());
     }
 
     @Override
@@ -80,8 +83,8 @@ private static void registerInitFiltersAccess(DuringAnalysisAccess a) {
 @SingletonTraits(access = BuildtimeAccessOnly.class, layeredCallbacks = NoLayeredCallbacks.class, layeredInstallationKind = Independent.class)
 class SimpleWebServerFeature implements InternalFeature {
 
-    private static Optional<Module> requiredModule() {
-        return ModuleLayer.boot().findModule("jdk.httpserver");
+    private static Optional<ResolvedJavaModule> requiredModule() {
+        return ResolvedJavaModuleLayer.boot().findModule("jdk.httpserver");
     }
 
     @Override
@@ -91,7 +94,7 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        SimpleWebServerFeature.class.getModule().addReads(requiredModule().get());
+        HostModuleUtil.addReads(SimpleWebServerFeature.class, requiredModule().get());
 
         RuntimeClassInitializationSupport rci = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
         rci.initializeAtRunTime("sun.net.httpserver.simpleserver", "Allocates InetAddress in class initializers");

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

@@ -30,6 +30,7 @@
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 /**
  * These substitutions are necessary because the static initializations of these fields are copies
@@ -101,6 +102,6 @@ final class Target_sun_misc_Unsafe {
 class JdkUnsupportedIsEnabled implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
-        return ModuleLayer.boot().findModule("jdk.unsupported").isPresent();
+        return ResolvedJavaModuleLayer.boot().findModule("jdk.unsupported").isPresent();
     }
 }

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

@@ -33,6 +33,8 @@
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.heap.Heap;
+import com.oracle.svm.util.HostModuleUtil;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 /**
  * Note that sun.rmi.transport.GC is initialized at build-time to avoid including the rmi library,
@@ -55,9 +57,9 @@ class JavaRMIModuleAvailable implements BooleanSupplier {
     private static final boolean hasModule;
 
     static {
-        var module = ModuleLayer.boot().findModule("java.rmi");
+        var module = ResolvedJavaModuleLayer.boot().findModule("java.rmi");
         if (module.isPresent()) {
-            JavaRMIModuleAvailable.class.getModule().addReads(module.get());
+            HostModuleUtil.addReads(JavaRMIModuleAvailable.class, module.get());
         }
         hasModule = module.isPresent();
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementAgentModule.java

@@ -29,7 +29,10 @@
 import java.util.function.BooleanSupplier;
 
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.HostModuleUtil;
 import com.oracle.svm.util.ReflectionUtil;
+import com.oracle.svm.util.ResolvedJavaModule;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 public class ManagementAgentModule {
 
@@ -42,9 +45,9 @@ public class ManagementAgentModule {
     static final String CONFIG_FILE_OPEN_FAILED;
 
     static {
-        Optional<Module> agentModule = ModuleLayer.boot().findModule("jdk.management.agent");
+        Optional<ResolvedJavaModule> agentModule = ResolvedJavaModuleLayer.boot().findModule("jdk.management.agent");
         if (agentModule.isPresent()) {
-            ManagementAgentModule.class.getModule().addReads(agentModule.get());
+            HostModuleUtil.addReads(ManagementAgentModule.class, agentModule.get());
             var agentClass = ReflectionUtil.lookupClass(false, "jdk.internal.agent.Agent");
             agentStartAgent = ReflectionUtil.lookupMethod(agentClass, "startAgent");
             agentError = ReflectionUtil.lookupMethod(agentClass, "error", String.class, String.class);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/management/ManagementSupport.java

@@ -64,6 +64,8 @@
 import com.oracle.svm.core.thread.ThreadListener;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.util.HostModuleUtil;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 import com.sun.jmx.mbeanserver.MXBeanLookup;
 
 import jdk.graal.compiler.api.replacements.Fold;
@@ -297,9 +299,9 @@ private synchronized PlatformManagedObject getFlightRecorderMXBean() {
     @Platforms(Platform.HOSTED_ONLY.class)
     @SuppressWarnings("unchecked")
     private static Class<? extends PlatformManagedObject> getFlightRecorderMXBeanClass() {
-        var jfrModule = ModuleLayer.boot().findModule("jdk.management.jfr");
+        var jfrModule = ResolvedJavaModuleLayer.boot().findModule("jdk.management.jfr");
         if (jfrModule.isPresent()) {
-            ManagementSupport.class.getModule().addReads(jfrModule.get());
+            HostModuleUtil.addReads(ManagementSupport.class, jfrModule.get());
             try {
                 return (Class<? extends PlatformManagedObject>) Class.forName("jdk.management.jfr.FlightRecorderMXBean", false, Object.class.getClassLoader());
             } catch (ClassNotFoundException ex) {

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

@@ -24,12 +24,6 @@
  */
 package com.oracle.svm.hosted;
 
-import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
-import com.oracle.svm.util.ReflectionUtil;
-
-import org.graalvm.collections.EconomicMap;
-import org.graalvm.nativeimage.ImageSingletons;
-
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
@@ -54,6 +48,13 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 
+import org.graalvm.collections.EconomicMap;
+import org.graalvm.nativeimage.ImageSingletons;
+
+import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
+import com.oracle.svm.util.ReflectionUtil;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
+
 import jdk.internal.access.JavaLangAccess;
 import jdk.internal.loader.BuiltinClassLoader;
 import jdk.internal.misc.Unsafe;
@@ -99,7 +100,7 @@ public static DynamicAccessDetectionSupport instance() {
 
     public DynamicAccessDetectionSupport(AnalysisMetaAccess metaAccess) {
         this.metaAccess = metaAccess;
-        boolean jdkUnsupportedModulePresent = ModuleLayer.boot().findModule("jdk.unsupported").isPresent();
+        boolean jdkUnsupportedModulePresent = ResolvedJavaModuleLayer.boot().findModule("jdk.unsupported").isPresent();
 
         put(reflectionMethods, Class.class, Set.of(
                         new MethodSignature("forName", String.class),

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

@@ -38,16 +38,19 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.FeatureImpl.DuringAnalysisAccessImpl;
 import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
+import com.oracle.svm.util.HostModuleUtil;
 import com.oracle.svm.util.ReflectionUtil;
+import com.oracle.svm.util.ResolvedJavaModule;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 
 import jdk.graal.compiler.options.Option;
 import jdk.graal.compiler.options.OptionType;
 
 @AutomaticallyRegisteredFeature
 public class LoggingFeature implements InternalFeature {
 
-    private static Optional<Module> requiredModule() {
-        return ModuleLayer.boot().findModule("java.logging");
+    private static Optional<ResolvedJavaModule> requiredModule() {
+        return ResolvedJavaModuleLayer.boot().findModule("java.logging");
     }
 
     public static class Options {
@@ -74,7 +77,7 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        LoggingFeature.class.getModule().addReads(requiredModule().get());
+        HostModuleUtil.addReads(LoggingFeature.class, requiredModule().get());
     }
 
     @Override

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

@@ -114,6 +114,7 @@
 import com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor;
 import com.oracle.svm.util.ModuleSupport;
 import com.oracle.svm.util.ReflectionUtil;
+import com.oracle.svm.util.ResolvedJavaModuleLayer;
 import com.oracle.svm.util.TypeResult;
 
 import jdk.graal.compiler.debug.Assertions;
@@ -205,20 +206,20 @@ public static class Options {
                         KeyStore.class, Mac.class, MessageDigest.class, SSLContext.class,
                         SecretKeyFactory.class, SecureRandom.class, Signature.class, TrustManagerFactory.class));
 
-        if (ModuleLayer.boot().findModule("java.security.sasl").isPresent()) {
+        if (ResolvedJavaModuleLayer.boot().findModule("java.security.sasl").isPresent()) {
             classList.add(ReflectionUtil.lookupClass(false, "javax.security.sasl.SaslClientFactory"));
             classList.add(ReflectionUtil.lookupClass(false, "javax.security.sasl.SaslServerFactory"));
         }
-        if (ModuleLayer.boot().findModule("java.xml.crypto").isPresent()) {
+        if (ResolvedJavaModuleLayer.boot().findModule("java.xml.crypto").isPresent()) {
             classList.add(ReflectionUtil.lookupClass(false, "javax.xml.crypto.dsig.TransformService"));
             classList.add(ReflectionUtil.lookupClass(false, "javax.xml.crypto.dsig.XMLSignatureFactory"));
             classList.add(ReflectionUtil.lookupClass(false, "javax.xml.crypto.dsig.keyinfo.KeyInfoFactory"));
         }
-        if (ModuleLayer.boot().findModule("java.smartcardio").isPresent()) {
+        if (ResolvedJavaModuleLayer.boot().findModule("java.smartcardio").isPresent()) {
             classList.add(ReflectionUtil.lookupClass(false, "javax.smartcardio.TerminalFactory"));
         }
 
-        isMscapiModulePresent = ModuleLayer.boot().findModule("jdk.crypto.mscapi").isPresent();
+        isMscapiModulePresent = ResolvedJavaModuleLayer.boot().findModule("jdk.crypto.mscapi").isPresent();
 
         knownServices = Collections.unmodifiableList(classList);
     }