[GR-62674] Build tools: pass --sun-misc-unsafe-memory-access=allow on JDK24+.

PullRequest: graalpython/3704

Author: steve-s

graalpython/com.oracle.graal.python.test/src/tests/standalone/test_maven_plugin.py

@@ -504,6 +504,33 @@ def test_python_resources_dir_and_external_dir_error(self):
             util.check_ouput("Cannot use <externalDirectory> and <resourceDirectory> at the same time", out)
 
 
+    @unittest.skipUnless(util.is_maven_plugin_test_enabled, "ENABLE_MAVEN_PLUGIN_UNITTESTS is not true")
+    def test_java_home_change(self):
+        with util.TemporaryTestDirectory() as tmpdir:
+            target_name = "check_home_warning_test"
+            target_dir = os.path.join(str(tmpdir), target_name)
+            self.generate_app(tmpdir, target_dir, target_name)
+
+            mvnw_cmd = util.get_mvn_wrapper(target_dir, self.env)
+
+            # build the app
+            process_resources_cmd = mvnw_cmd + ["package"]
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+
+            # update the generated launcher, so that it looks like it's been generated with different Java path
+            pyenvcfg = os.path.join(target_dir, 'target', 'pyvenv.cfg')
+            if os.path.exists(pyenvcfg):
+                util.replace_in_file(pyenvcfg, os.environ['JAVA_HOME'], '/bogus/java/home')
+            else:
+                util.replace_in_file(os.path.join(target_dir, 'target', 'graalpy.sh'), os.environ['JAVA_HOME'], '/bogus/java/home')
+
+            util.replace_in_file(os.path.join(target_dir, 'pom.xml'), 'termcolor==2.2', 'termcolor==2')
+            process_resources_cmd = mvnw_cmd + ["package"]
+            out, return_code = util.run_cmd(process_resources_cmd, self.env, cwd=target_dir)
+            util.check_ouput("BUILD SUCCESS", out)
+
+
     # Creates two Java apps from given pom templates, the dependencies between them
     # must be configured in the pom template(s)
     def _prepare_multi_project(self, tmpdir, app1_pom_template_name, app2_pom_template_name):

graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/exec/GraalPyRunner.java

@@ -51,6 +51,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
@@ -60,6 +61,18 @@ public class GraalPyRunner {
     private static final String BIN_DIR = IS_WINDOWS ? "Scripts" : "bin";
     private static final String EXE_SUFFIX = IS_WINDOWS ? ".exe" : "";
 
+    public static String[] getExtraJavaOptions() {
+        String javaVersion = System.getProperty("java.version");
+        try {
+            if (Integer.parseInt(javaVersion) >= 24) {
+                return new String[]{"--sun-misc-unsafe-memory-access=allow"};
+            }
+        } catch (NumberFormatException ex) {
+            // covers also javaVersion being 'null'
+        }
+        return new String[0];
+    }
+
     public static void run(Set<String> classpath, BuildToolLog log, String... args) throws IOException, InterruptedException {
         run(String.join(File.pathSeparator, classpath), log, args);
     }
@@ -69,6 +82,8 @@ public static void run(String classpath, BuildToolLog log, String... args) throw
         Path java = Paths.get(System.getProperty("java.home"), "bin", "java");
         List<String> cmd = new ArrayList<>();
         cmd.add(java.toString());
+        cmd.add("--enable-native-access=ALL-UNNAMED");
+        cmd.addAll(Arrays.asList(getExtraJavaOptions()));
         cmd.add("-classpath");
         cmd.add(classpath);
         cmd.add("com.oracle.graal.python.shell.GraalPythonMain");

graalpython/org.graalvm.python.embedding.tools/src/org/graalvm/python/embedding/tools/vfs/VFSUtils.java

@@ -690,65 +690,80 @@ private static Path ensureLauncher(Launcher launcherArgs, BuildToolLog log) thro
         }
     }
 
-    private static void generateLaunchers(Launcher launcherArgs, BuildToolLog log) throws IOException {
-        if (!Files.exists(launcherArgs.launcherPath)) {
-            info(log, "Generating GraalPy launchers");
-            createParentDirectories(launcherArgs.launcherPath);
-            Path java = Paths.get(System.getProperty("java.home"), "bin", "java");
-            String classpath = String.join(File.pathSeparator, launcherArgs.computeClassPath());
-            if (!IS_WINDOWS) {
-                var script = String.format("""
-                                #!/usr/bin/env bash
-                                %s --enable-native-access=ALL-UNNAMED -classpath %s %s --python.Executable="$0" "$@"
-                                """,
-                                java,
-                                String.join(File.pathSeparator, classpath),
-                                GRAALPY_MAIN_CLASS);
-                try {
-                    Files.writeString(launcherArgs.launcherPath, script);
-                    var perms = Files.getPosixFilePermissions(launcherArgs.launcherPath);
-                    perms.addAll(List.of(PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE, PosixFilePermission.OTHERS_EXECUTE));
-                    Files.setPosixFilePermissions(launcherArgs.launcherPath, perms);
-                } catch (IOException e) {
-                    throw new IOException(String.format("failed to create launcher %s", launcherArgs.launcherPath), e);
-                }
-            } else {
-                // on windows, generate a venv launcher that executes our mvn target
-                var script = String.format("""
-                                import os, shutil, struct, venv
-                                from pathlib import Path
-                                vl = os.path.join(venv.__path__[0], 'scripts', 'nt', 'graalpy.exe')
-                                tl = os.path.join(r'%s')
-                                os.makedirs(Path(tl).parent.absolute(), exist_ok=True)
-                                shutil.copy(vl, tl)
-                                cmd = r'%s --enable-native-access=ALL-UNNAMED -classpath "%s" %s'
-                                pyvenvcfg = os.path.join(os.path.dirname(tl), "pyvenv.cfg")
-                                with open(pyvenvcfg, 'w', encoding='utf-8') as f:
-                                    f.write('venvlauncher_command = ')
-                                    f.write(cmd)
-                                """,
-                                launcherArgs.launcherPath,
-                                java,
-                                classpath,
-                                GRAALPY_MAIN_CLASS);
-                File tmp;
-                try {
-                    tmp = File.createTempFile("create_launcher", ".py");
-                } catch (IOException e) {
-                    throw new IOException("failed to create tmp launcher", e);
-                }
-                tmp.deleteOnExit();
-                try (var wr = new FileWriter(tmp)) {
-                    wr.write(script);
-                } catch (IOException e) {
-                    throw new IOException(String.format("failed to write tmp launcher %s", tmp), e);
+    private static boolean checkWinLauncherJavaPath(Path venvCfg, Path java) {
+        try {
+            for (String line : Files.readAllLines(venvCfg)) {
+                if (line.trim().startsWith("venvlauncher_command = " + java)) {
+                    return true;
                 }
+            }
+        } catch (IOException ignore) {
+        }
+        return false;
+    }
 
-                try {
-                    GraalPyRunner.run(classpath, log, tmp.getAbsolutePath());
-                } catch (InterruptedException e) {
-                    throw new IOException(String.format("failed to run Graalpy launcher"), e);
-                }
+    private static void generateLaunchers(Launcher launcherArgs, BuildToolLog log) throws IOException {
+        debug(log, "Generating GraalPy launchers");
+        createParentDirectories(launcherArgs.launcherPath);
+        Path java = Paths.get(System.getProperty("java.home"), "bin", "java");
+        String classpath = String.join(File.pathSeparator, launcherArgs.computeClassPath());
+        String extraJavaOptions = String.join(" ", GraalPyRunner.getExtraJavaOptions());
+        if (!IS_WINDOWS) {
+            // we do not bother checking if it exists and has correct java home, since it is simple
+            // to regenerate the launcher
+            var script = String.format("""
+                            #!/usr/bin/env bash
+                            %s --enable-native-access=ALL-UNNAMED %s -classpath %s %s --python.Executable="$0" "$@"
+                            """,
+                            java,
+                            extraJavaOptions,
+                            String.join(File.pathSeparator, classpath),
+                            GRAALPY_MAIN_CLASS);
+            try {
+                Files.writeString(launcherArgs.launcherPath, script);
+                var perms = Files.getPosixFilePermissions(launcherArgs.launcherPath);
+                perms.addAll(List.of(PosixFilePermission.OWNER_EXECUTE, PosixFilePermission.GROUP_EXECUTE, PosixFilePermission.OTHERS_EXECUTE));
+                Files.setPosixFilePermissions(launcherArgs.launcherPath, perms);
+            } catch (IOException e) {
+                throw new IOException(String.format("failed to create launcher %s", launcherArgs.launcherPath), e);
+            }
+        } else if (!Files.exists(launcherArgs.launcherPath) || !checkWinLauncherJavaPath(launcherArgs.launcherPath.getParent().resolve("pyenv.cfg"), java)) {
+            // on windows, generate a venv launcher that executes the java command
+            var script = String.format("""
+                            import os, shutil, struct, venv
+                            from pathlib import Path
+                            vl = os.path.join(venv.__path__[0], 'scripts', 'nt', 'graalpy.exe')
+                            tl = os.path.join(r'%s')
+                            os.makedirs(Path(tl).parent.absolute(), exist_ok=True)
+                            shutil.copy(vl, tl)
+                            cmd = r'%s --enable-native-access=ALL-UNNAMED %s -classpath "%s" %s'
+                            pyvenvcfg = os.path.join(os.path.dirname(tl), "pyvenv.cfg")
+                            with open(pyvenvcfg, 'w', encoding='utf-8') as f:
+                                f.write('venvlauncher_command = ')
+                                f.write(cmd)
+                            """,
+                            launcherArgs.launcherPath,
+                            java,
+                            extraJavaOptions,
+                            classpath,
+                            GRAALPY_MAIN_CLASS);
+            File tmp;
+            try {
+                tmp = File.createTempFile("create_launcher", ".py");
+            } catch (IOException e) {
+                throw new IOException("failed to create tmp launcher", e);
+            }
+            tmp.deleteOnExit();
+            try (var wr = new FileWriter(tmp)) {
+                wr.write(script);
+            } catch (IOException e) {
+                throw new IOException(String.format("failed to write tmp launcher %s", tmp), e);
+            }
+
+            try {
+                GraalPyRunner.run(classpath, log, tmp.getAbsolutePath());
+            } catch (InterruptedException e) {
+                throw new IOException("failed to run Graalpy launcher", e);
             }
         }
     }