[GR-67816] Handle --limit-modules and some more -XX options by JVM launcher.

PullRequest: graal/21536

Author: entlicher

espresso/src/com.oracle.truffle.espresso.launcher/src/com/oracle/truffle/espresso/launcher/EspressoLauncher.java

@@ -31,6 +31,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -183,6 +184,9 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
         ArrayList<String> unrecognized = new ArrayList<>();
         boolean isRelaxStaticObjectSafetyChecksSet = false;
         int javaAgentIndex = 0;
+        boolean heapDumpOnOutOfMemoryError = false;
+        String heapDumpPath = null;
+        boolean ignoreUnrecognized = false;
 
         List<String> expandedArguments = expandAtFiles(arguments);
 
@@ -231,6 +235,9 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                     espressoOptions.put("java.Module", mainClassName);
                     launchMode = LaunchMode.LM_MODULE;
                     break;
+                case "--limit-modules":
+                    espressoOptions.put("java.Properties.jdk.module.limitmods", args.getValue(arg, "limit-modules"));
+                    break;
                 case "-jar":
                     jarFileName = args.getValue(arg, "jar file");
                     break;
@@ -285,6 +292,18 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                 case "-XX:+PauseOnExit":
                     pauseOnExit = true;
                     break;
+                case "-XX:+HeapDumpOnOutOfMemoryError":
+                    heapDumpOnOutOfMemoryError = true;
+                    break;
+                case "-XX:-HeapDumpOnOutOfMemoryError":
+                    heapDumpOnOutOfMemoryError = false;
+                    break;
+                case "-XX:+IgnoreUnrecognizedVMOptions":
+                    ignoreUnrecognized = true;
+                    break;
+                case "-XX:-IgnoreUnrecognizedVMOptions":
+                    ignoreUnrecognized = false;
+                    break;
 
                 case "--engine.RelaxStaticObjectSafetyChecks":
                     isRelaxStaticObjectSafetyChecksSet = true;
@@ -331,6 +350,8 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
                     } else if (arg.startsWith("--sun-misc-unsafe-memory-access")) {
                         String value = args.getValue(arg, "sun.misc.Unsafe memory access");
                         espressoOptions.put("java.SunMiscUnsafeMemoryAccess", value);
+                    } else if (arg.startsWith("-XX:HeapDumpPath=")) {
+                        heapDumpPath = arg.substring("-XX:HeapDumpPath=".length());
                     } else if (arg.startsWith("-XX:")) {
                         handleXXArg(arg, unrecognized);
                     } else if (arg.startsWith("-D")) {
@@ -408,6 +429,23 @@ protected List<String> preprocessArguments(List<String> arguments, Map<String, S
             espressoOptions.put("engine.RelaxStaticObjectSafetyChecks", "true");
         }
 
+        if (heapDumpOnOutOfMemoryError) {
+            unrecognized.add("--vm.XX:+HeapDumpOnOutOfMemoryError");
+        }
+        if (heapDumpPath != null) {
+            unrecognized.add("--vm.XX:HeapDumpPath=" + heapDumpPath);
+        }
+
+        if (ignoreUnrecognized) {
+            // We remove the unrecognized -XX options from the list to ignore them:
+            Iterator<String> unrecognizedIt = unrecognized.iterator();
+            while (unrecognizedIt.hasNext()) {
+                String option = unrecognizedIt.next();
+                if (option.startsWith("-XX")) {
+                    unrecognizedIt.remove();
+                }
+            }
+        }
         return unrecognized;
     }
 

espresso/src/com.oracle.truffle.espresso.libjavavm/src/com/oracle/truffle/espresso/libjavavm/Arguments.java

@@ -95,6 +95,7 @@ public static int setupContext(Context.Builder builder, JNIJavaVMInitArgs args,
 
         boolean ignoreUnrecognized = args.getIgnoreUnrecognized();
         boolean printFlagsFinal = false;
+        String argumentError = null;
         List<String> xOptions = new ArrayList<>();
 
         for (int i = 0; i < count; i++) {
@@ -243,14 +244,18 @@ public static int setupContext(Context.Builder builder, JNIJavaVMInitArgs args,
                     }
                 }
             } catch (ArgumentException e) {
-                if (!ignoreUnrecognized) {
-                    // Failed to parse
-                    warn(e.getMessage());
-                    return JNI_ERR();
+                // Failed to parse
+                if (argumentError == null) {
+                    argumentError = e.getMessage();
                 }
             }
         }
 
+        if (argumentError != null && !ignoreUnrecognized) {
+            warn(argumentError);
+            return JNI_ERR();
+        }
+
         for (String xOption : xOptions) {
             RuntimeOptions.set(xOption.substring(2 /* drop the -X */), null);
         }