Add upgrade-module-path to the list-modules invocation

Author: jerboaa

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java

@@ -1250,7 +1250,7 @@ private int completeImageBuild() {
 
         List<String> finalImageBuilderJavaArgs = Stream.concat(config.getBuilderJavaArgs().stream(), imageBuilderJavaArgs.stream()).collect(Collectors.toList());
         try {
-            return buildImage(finalImageBuilderJavaArgs, imageBuilderClasspath, imageBuilderModulePath, imageBuilderArgs, finalImageClasspath, finalImageModulePath);
+            return buildImage(finalImageBuilderJavaArgs, imageBuilderClasspath, imageBuilderModulePath, imageBuilderArgs, finalImageClasspath, finalImageModulePath, upgradeModulePath);
         } finally {
             if (useColorfulOutput) {
                 performANSIReset();
@@ -1476,7 +1476,7 @@ protected static String createImageBuilderArgumentFile(List<String> imageBuilder
     }
 
     protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHashSet<Path> mp, ArrayList<String> imageArgs, LinkedHashSet<Path> imagecp,
-                    LinkedHashSet<Path> imagemp) {
+                    LinkedHashSet<Path> imagemp, String upgradeModulePath) {
         List<String> arguments = new ArrayList<>();
         arguments.addAll(javaArgs);
 
@@ -1503,7 +1503,7 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
         Function<Path, Path> substituteModulePath = useBundle() ? bundleSupport::substituteModulePath : Function.identity();
         List<Path> substitutedImageModulePath = imagemp.stream().map(substituteModulePath).toList();
 
-        Map<String, Path> modules = listModulesFromPath(javaExecutable, Stream.concat(mp.stream(), imagemp.stream()).distinct().toList());
+        Map<String, Path> modules = listModulesFromPath(javaExecutable, Stream.concat(mp.stream(), imagemp.stream()).distinct().toList(), upgradeModulePath);
         if (!addModules.isEmpty()) {
 
             arguments.add("-D" + ModuleSupport.PROPERTY_IMAGE_EXPLICITLY_ADDED_MODULES + "=" +
@@ -1630,16 +1630,16 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
     /**
      * Resolves and lists all modules given a module path.
      *
-     * @see #callListModules(String, List)
+     * @see #callListModules(String, List, String)
      */
-    private Map<String, Path> listModulesFromPath(String javaExecutable, Collection<Path> modulePath) {
+    private Map<String, Path> listModulesFromPath(String javaExecutable, Collection<Path> modulePath, String upgradeModulePath) {
         if (modulePath.isEmpty() || !config.modulePathBuild) {
             return Map.of();
         }
         String modulePathEntries = modulePath.stream()
                         .map(Path::toString)
                         .collect(Collectors.joining(File.pathSeparator));
-        return callListModules(javaExecutable, List.of("-p", modulePathEntries));
+        return callListModules(javaExecutable, List.of("-p", modulePathEntries), upgradeModulePath);
     }
 
     /**
@@ -1650,13 +1650,19 @@ private Map<String, Path> listModulesFromPath(String javaExecutable, Collection<
      * <p>
      * This is a much more robust solution then trying to parse the JDK file structure manually.
      */
-    private static Map<String, Path> callListModules(String javaExecutable, List<String> arguments) {
+    private static Map<String, Path> callListModules(String javaExecutable, List<String> arguments, String upgradeModulePath) {
         Process listModulesProcess = null;
         Map<String, Path> result = new LinkedHashMap<>();
         try {
             var pb = new ProcessBuilder(javaExecutable);
             pb.command().addAll(arguments);
             pb.command().add("--list-modules");
+            if (!upgradeModulePath.isEmpty()) {
+                // non jlinked JDK need the jdk.internal.vm.compiler (graal.jar) in the
+                // upgrade-module-path directive
+                pb.command().add("--upgrade-module-path");
+                pb.command().add(upgradeModulePath);
+            }
             pb.environment().clear();
             listModulesProcess = pb.start();