Skip to content

Commit dac0cfd

Browse files
[GR-69258] Espresso dev launcher: accept more XX options.
PullRequest: graal/22044
2 parents 451808a + f37bb12 commit dac0cfd

File tree

1 file changed

+14
-6
lines changed
  • espresso/src/com.oracle.truffle.espresso.launcher/src/com/oracle/truffle/espresso/launcher

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -530,13 +530,16 @@ private void parseArgFile(String pathArg, List<String> expanded) {
530530
}
531531
}
532532

533-
private static final Set<String> knownPassThroughOptions = Set.of(
534-
"SharedArchiveFile",
535-
"WhiteBoxAPI",
536-
"EnableJVMCI");
533+
private static final Set<String> jvmPassThroughVMOptions = Set.of(
534+
"PrintFlagsFinal",
535+
"MaxRAMPercentage",
536+
"UseParallelGC",
537+
"GCTimeRatio",
538+
"ExitOnOutOfMemoryError");
537539

538540
private static final Set<String> ignoredXXOptions = Set.of(
539541
"UseJVMCICompiler",
542+
"UseJVMCINativeLibrary",
540543
"EnableDynamicAgentLoading");
541544

542545
private void handleXXArg(String fullArg, ArrayList<String> unrecognized) {
@@ -559,8 +562,13 @@ private void handleXXArg(String fullArg, ArrayList<String> unrecognized) {
559562
getError().println("Ignoring " + arg);
560563
return;
561564
}
562-
if (knownPassThroughOptions.contains(name)) {
563-
espressoOptions.put("java." + name, value);
565+
String polyglotOption = "java." + name;
566+
if (findOptionDescriptor("java", polyglotOption) != null) {
567+
espressoOptions.put(polyglotOption, value);
568+
return;
569+
}
570+
if (!isAOT() && jvmPassThroughVMOptions.contains(name)) {
571+
unrecognized.add("--vm." + fullArg.substring(1));
564572
return;
565573
}
566574
switch (name) {

0 commit comments

Comments
 (0)