Ensure building with minimal observable modules works

Author: olpaw

substratevm/mx.substratevm/suite.py

@@ -243,7 +243,7 @@
                 "java.compiler",
                 "jdk.jfr",
                 "jdk.management",
-                "jdk.management.jfr",
+                "jdk.zipfs",
             ],
             "requiresConcealed" : {
                 "java.base" : [
@@ -1324,7 +1324,6 @@
                 "requires": [
                     "java.management",
                     "jdk.management",
-                    "jdk.management.jfr",
                 ],
                 "uses" : [
                     "org.graalvm.nativeimage.Platform",

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

@@ -26,6 +26,8 @@
 
 package com.oracle.svm.core.jdk;
 
+import java.util.function.BooleanSupplier;
+
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.Substitute;
@@ -37,8 +39,8 @@
  * which is not needed as it only implements the native maxObjectInspectionAge() method, which in
  * turn is {@link Target_sun_rmi_transport_GC#maxObjectInspectionAge substituted in here}.
  */
-@TargetClass(className = "sun.rmi.transport.GC")
-final class Target_sun_rmi_transport_GC {
+@TargetClass(className = "sun.rmi.transport.GC", onlyWith = JavaRMIModuleAvailable.class)
+public final class Target_sun_rmi_transport_GC {
     @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset)//
     private static Thread daemon = null;
 
@@ -47,3 +49,21 @@ public static long maxObjectInspectionAge() {
         return Heap.getHeap().getMillisSinceLastWholeHeapExamined();
     }
 }
+
+class JavaRMIModuleAvailable implements BooleanSupplier {
+
+    private static final boolean hasModule;
+
+    static {
+        var module = ModuleLayer.boot().findModule("java.rmi");
+        if (module.isPresent()) {
+            JavaRMIModuleAvailable.class.getModule().addReads(module.get());
+        }
+        hasModule = module.isPresent();
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return hasModule;
+    }
+}

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

@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 
 import javax.management.DynamicMBean;
@@ -62,8 +63,6 @@
 import com.oracle.svm.core.util.VMError;
 import com.sun.jmx.mbeanserver.MXBeanLookup;
 
-import jdk.management.jfr.FlightRecorderMXBean;
-
 /**
  * This class provides the SVM support implementation for the MXBean that provide VM introspection,
  * which is accessible in the JDK via {@link ManagementFactory}. There are two mostly independent
@@ -105,6 +104,23 @@
  */
 public final class ManagementSupport implements ThreadListener {
 
+    private static final boolean isJdkManagementJfrModulePresent;
+
+    static {
+        var loggingModule = ModuleLayer.boot().findModule("jdk.management.jfr");
+        if (loggingModule.isPresent()) {
+            ManagementSupport.class.getModule().addReads(loggingModule.get());
+        }
+        isJdkManagementJfrModulePresent = loggingModule.isPresent();
+    }
+
+    static class JdkManagementJfrModulePresent implements BooleanSupplier {
+        @Override
+        public boolean getAsBoolean() {
+            return isJdkManagementJfrModulePresent;
+        }
+    }
+
     /**
      * All {@link PlatformManagedObject} structured by their interface. The same object can be
      * contained multiple times under different keys. The value is either the
@@ -123,7 +139,7 @@ public final class ManagementSupport implements ThreadListener {
 
     /* Initialized lazily at run time. */
     private OperatingSystemMXBean osMXBean;
-    private FlightRecorderMXBean flightRecorderMXBean;
+    private PlatformManagedObject flightRecorderMXBean;
 
     /** The singleton MBean server for the platform, initialized lazily at run time. */
     MBeanServer platformMBeanServer;
@@ -150,7 +166,7 @@ public final class ManagementSupport implements ThreadListener {
          * run time.
          */
         doAddPlatformManagedObjectSingleton(getOsMXBeanInterface(), (PlatformManagedObjectSupplier) this::getOsMXBean);
-        doAddPlatformManagedObjectSingleton(FlightRecorderMXBean.class, (PlatformManagedObjectSupplier) this::getFlightRecorderMXBean);
+        doAddPlatformManagedObjectSingleton(PlatformManagedObject.class, (PlatformManagedObjectSupplier) this::getFlightRecorderMXBean);
     }
 
     private static Class<?> getOsMXBeanInterface() {
@@ -172,7 +188,7 @@ private synchronized OperatingSystemMXBean getOsMXBean() {
         return osMXBean;
     }
 
-    private synchronized FlightRecorderMXBean getFlightRecorderMXBean() {
+    private synchronized PlatformManagedObject getFlightRecorderMXBean() {
         /**
          * Requires JFR support and that JMX is user-enabled because
          * {@code jdk.management.jfr.FlightRecorderMXBeanImpl} makes
@@ -182,7 +198,7 @@ private synchronized FlightRecorderMXBean getFlightRecorderMXBean() {
             return null;
         }
         if (flightRecorderMXBean == null) {
-            flightRecorderMXBean = SubstrateUtil.cast(new Target_jdk_management_jfr_FlightRecorderMXBeanImpl(), FlightRecorderMXBean.class);
+            flightRecorderMXBean = SubstrateUtil.cast(new Target_jdk_management_jfr_FlightRecorderMXBeanImpl(), PlatformManagedObject.class);
         }
         return flightRecorderMXBean;
     }
@@ -384,7 +400,7 @@ private static PlatformManagedObject handleLazyPlatformManagedObjectSingleton(Ob
 }
 
 // This is required because FlightRecorderMXBeanImpl is only accessible within its package.
-@TargetClass(className = "jdk.management.jfr.FlightRecorderMXBeanImpl")
+@TargetClass(className = "jdk.management.jfr.FlightRecorderMXBeanImpl", onlyWith = ManagementSupport.JdkManagementJfrModulePresent.class)
 final class Target_jdk_management_jfr_FlightRecorderMXBeanImpl {
     @Alias
     Target_jdk_management_jfr_FlightRecorderMXBeanImpl() {

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

@@ -195,6 +195,7 @@ private static void checkBootModuleDependencies(boolean verbose) {
                         "jdk.management",
                         "java.compiler",
                         "jdk.jfr",
+                        "jdk.zipfs",
                         "jdk.management.jfr");
 
         Set<String> unexpectedBuilderDependencies = modulesBuilderDependsOn.stream().map(Module::getName).collect(Collectors.toSet());

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationJavaNio.java

@@ -27,7 +27,6 @@
 import java.net.InetAddress;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
-import java.util.Optional;
 import java.util.function.Consumer;
 
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
@@ -47,8 +46,22 @@
 @AutomaticallyRegisteredFeature
 public class JNIRegistrationJavaNio extends JNIRegistrationUtil implements InternalFeature {
 
-    private static Optional<Module> jdkSctpModule() {
-        return ModuleLayer.boot().findModule("jdk.sctp");
+    private static final boolean isJdkSctpModulePresent;
+    private static final boolean isJavaNamingModulePresent;
+
+    static {
+        Module thisModule = JNIRegistrationJavaNio.class.getModule();
+        var sctpModule = ModuleLayer.boot().findModule("jdk.sctp");
+        if (sctpModule.isPresent()) {
+            thisModule.addReads(sctpModule.get());
+        }
+        isJdkSctpModulePresent = sctpModule.isPresent();
+
+        var namingModule = ModuleLayer.boot().findModule("java.naming");
+        if (namingModule.isPresent()) {
+            thisModule.addReads(namingModule.get());
+        }
+        isJavaNamingModulePresent = namingModule.isPresent();
     }
 
     @Override
@@ -64,7 +77,7 @@ public void duringSetup(DuringSetupAccess a) {
             rerunClassInit(a, "sun.nio.ch.SimpleAsynchronousFileChannelImpl", "sun.nio.ch.SimpleAsynchronousFileChannelImpl$DefaultExecutorHolder",
                             "sun.nio.ch.SinkChannelImpl", "sun.nio.ch.SourceChannelImpl");
             rerunClassInit(a, "sun.nio.fs.UnixNativeDispatcher", "sun.nio.ch.UnixAsynchronousServerSocketChannelImpl");
-            if (isLinux() && jdkSctpModule().isPresent()) {
+            if (isLinux() && isJdkSctpModulePresent) {
                 rerunClassInit(a, "sun.nio.ch.sctp.SctpChannelImpl");
             }
         } else if (isWindows()) {
@@ -93,7 +106,7 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
 
         if (isPosix()) {
             a.registerReachabilityHandler(JNIRegistrationJavaNio::registerUnixNativeDispatcherInit, method(a, "sun.nio.fs.UnixNativeDispatcher", "init"));
-            if (isLinux() && jdkSctpModule().isPresent()) {
+            if (isLinux() && isJdkSctpModulePresent) {
                 a.registerReachabilityHandler(JNIRegistrationJavaNio::registerSctpChannelImplInitIDs, method(a, "sun.nio.ch.sctp.SctpChannelImpl", "initIDs"));
             }
 
@@ -102,7 +115,10 @@ public void beforeAnalysis(BeforeAnalysisAccess a) {
             a.registerReachabilityHandler(JNIRegistrationJavaNio::registerIocpInitIDs, method(a, "sun.nio.ch.Iocp", "initIDs"));
         }
 
-        a.registerReachabilityHandler(JNIRegistrationJavaNio::registerConnectionCreateInetSocketAddress, method(a, "com.sun.jndi.ldap.Connection", "createInetSocketAddress", String.class, int.class));
+        if (isJavaNamingModulePresent) {
+            a.registerReachabilityHandler(JNIRegistrationJavaNio::registerConnectionCreateInetSocketAddress,
+                            method(a, "com.sun.jndi.ldap.Connection", "createInetSocketAddress", String.class, int.class));
+        }
 
         Consumer<DuringAnalysisAccess> registerInitInetAddressIDs = JNIRegistrationJavaNet::registerInitInetAddressIDs;
         a.registerReachabilityHandler(registerInitInetAddressIDs, method(a, "sun.nio.ch.Net", "initIDs"));