Ensure modules from module path can resolve their system module dependencies

Author: olpaw

substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/ModuleLayerFeature.java

@@ -308,8 +308,8 @@ private static List<Module> findApplicationModules(ModuleLayer runtimeBootLayer,
     }
 
     private static Configuration synthesizeRuntimeBootLayerConfiguration(List<Path> mp, Set<String> reachableModules) {
-        ModuleFinder beforeFinder = new BootModuleLayerModuleFinder();
-        ModuleFinder afterFinder = ModuleFinder.of(mp.toArray(Path[]::new));
+        ModuleFinder beforeFinder = ModuleFinder.of(mp.toArray(Path[]::new));
+        ModuleFinder afterFinder = ModuleFinder.ofSystem();
 
         try {
             ModuleFinder composed = ModuleFinder.compose(beforeFinder, afterFinder);
@@ -346,27 +346,6 @@ private void patchRuntimeBootLayer(ModuleLayer runtimeBootLayer, Map<String, Mod
         runtimeBootLayer.modules();
     }
 
-    static class BootModuleLayerModuleFinder implements ModuleFinder {
-
-        @Override
-        public Optional<ModuleReference> find(String name) {
-            return ModuleLayer.boot()
-                            .configuration()
-                            .findModule(name)
-                            .map(ResolvedModule::reference);
-        }
-
-        @Override
-        public Set<ModuleReference> findAll() {
-            return ModuleLayer.boot()
-                            .configuration()
-                            .modules()
-                            .stream()
-                            .map(ResolvedModule::reference)
-                            .collect(Collectors.toSet());
-        }
-    }
-
     private static final class HostedRuntimeModulePair {
         static HostedRuntimeModulePair withReplicatedHostedModule(Module module) {
             return new HostedRuntimeModulePair(module, module);

substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk/NativeImageClassLoaderSupportJDK11OrLater.java

@@ -86,10 +86,9 @@ public NativeImageClassLoaderSupportJDK11OrLater(ClassLoader defaultSystemClassL
     }
 
     private static ModuleLayer createModuleLayer(Path[] modulePaths, ClassLoader parent) {
-        ModuleFinder finder = ModuleFinder.of(modulePaths);
-        List<Configuration> parents = List.of(ModuleLayer.boot().configuration());
-        Set<String> moduleNames = finder.findAll().stream().map(moduleReference -> moduleReference.descriptor().name()).collect(Collectors.toSet());
-        Configuration configuration = Configuration.resolve(finder, parents, finder, moduleNames);
+        ModuleFinder modulePathsFinder = ModuleFinder.of(modulePaths);
+        Set<String> moduleNames = modulePathsFinder.findAll().stream().map(moduleReference -> moduleReference.descriptor().name()).collect(Collectors.toSet());
+        Configuration configuration = ModuleLayer.boot().configuration().resolve(modulePathsFinder, ModuleFinder.ofSystem(), moduleNames);
         /**
          * For the modules we want to build an image for, a ModuleLayer is needed that can be
          * accessed with a single classloader so we can use it for {@link ImageClassLoader}.