Fix numbered module path options handling in JNI invocation API

The truffle options should be used instead of the system properties to
avoid clashing with properties set by the VM.

Author: gilles-duboscq

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

@@ -174,7 +174,7 @@ public static int setupContext(Context.Builder builder, JNIJavaVMInitArgs args)
                     } else if (optionString.startsWith("--enable-native-access=")) {
                         handler.enableNativeAccess(optionString.substring("--enable-native-access=".length()));
                     } else if (optionString.startsWith("--module-path=")) {
-                        builder.option(JAVA_PROPS + "jdk.module.path", optionString.substring("--module-path=".length()));
+                        builder.option("java.ModulePath", optionString.substring("--module-path=".length()));
                     } else if (optionString.startsWith("--upgrade-module-path=")) {
                         builder.option(JAVA_PROPS + "jdk.module.upgrade.path", optionString.substring("--upgrade-module-path=".length()));
                     } else if (optionString.startsWith("--limit-modules=")) {

espresso/src/com.oracle.truffle.espresso.libjavavm/src/com/oracle/truffle/espresso/libjavavm/arghelper/ArgumentsHandler.java

@@ -26,7 +26,10 @@
 import static com.oracle.truffle.espresso.libjavavm.Arguments.abort;
 import static com.oracle.truffle.espresso.libjavavm.Arguments.warn;
 
+import java.io.File;
 import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -54,14 +57,37 @@ public class ArgumentsHandler {
      */
     public static final int LAUNCHER_OPTIONS_INDENT = 45;
 
+    private static final String JDK_MODULES_PREFIX = "jdk.module.";
+
+    private static final String ADD_MODULES = JDK_MODULES_PREFIX + "addmods";
+    private static final String ADD_EXPORTS = JDK_MODULES_PREFIX + "addexports";
+    private static final String ADD_OPENS = JDK_MODULES_PREFIX + "addopens";
+    private static final String ADD_READS = JDK_MODULES_PREFIX + "addreads";
+    private static final String ENABLE_NATIVE_ACCESS = JDK_MODULES_PREFIX + "enable.native.access";
+
+    private static final String MODULE_PATH = JDK_MODULES_PREFIX + "path";
+    private static final String UPGRADE_PATH = JDK_MODULES_PREFIX + "upgrade.path";
+    private static final String LIMIT_MODS = JDK_MODULES_PREFIX + "limitmods";
+
+    private static final String[] KNOWN_MODULE_OPTIONS = {
+                    ADD_MODULES,
+                    ADD_EXPORTS,
+                    ADD_OPENS,
+                    ADD_READS,
+                    ENABLE_NATIVE_ACCESS,
+                    MODULE_PATH,
+                    UPGRADE_PATH,
+                    LIMIT_MODS,
+    };
+
     private static final PrintStream out = System.out;
 
     private final Native nativeAccess;
     private final PolyglotArgs polyglotAccess;
-    private final ModulePropertyCounter modulePropertyCounter;
 
     private final Set<String> ignoredXXOptions;
     private final Map<String, String> mappedXXOptions;
+    private final Context.Builder builder;
 
     private boolean experimental;
 
@@ -75,14 +101,20 @@ public class ArgumentsHandler {
 
     private boolean showIgnored;
 
+    private List<String> addModules = new ArrayList<>();
+    private List<String> addExports = new ArrayList<>();
+    private List<String> addOpens = new ArrayList<>();
+    private List<String> addReads = new ArrayList<>();
+    private List<String> enableNativeAccess = new ArrayList<>();
+
     @SuppressWarnings("this-escape")
     public ArgumentsHandler(Context.Builder builder, Set<String> ignoredXXOptions, Map<String, String> mappedXXOptions, JNIJavaVMInitArgs args) {
         assert mappedXXOptions.values().stream().allMatch(s -> s.contains("."));
         this.ignoredXXOptions = ignoredXXOptions;
         this.mappedXXOptions = mappedXXOptions;
         this.nativeAccess = new Native(this);
-        this.modulePropertyCounter = new ModulePropertyCounter(builder);
         this.polyglotAccess = new PolyglotArgs(builder, this);
+        this.builder = builder;
         parseEarlyArguments(args);
     }
 
@@ -122,27 +154,34 @@ private void parseEarlyArguments(JNIJavaVMInitArgs args) {
     }
 
     public boolean isModulesOption(String key) {
-        return modulePropertyCounter.isModulesOption(key);
+        if (key.startsWith(JDK_MODULES_PREFIX)) {
+            for (String known : KNOWN_MODULE_OPTIONS) {
+                if (key.equals(known)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 
     public void addModules(String option) {
-        modulePropertyCounter.addModules(option);
+        addModules.add(option);
     }
 
     public void addExports(String option) {
-        modulePropertyCounter.addExports(option);
+        addExports.add(option);
     }
 
     public void addOpens(String option) {
-        modulePropertyCounter.addOpens(option);
+        addOpens.add(option);
     }
 
     public void addReads(String option) {
-        modulePropertyCounter.addReads(option);
+        addReads.add(option);
     }
 
     public void enableNativeAccess(String option) {
-        modulePropertyCounter.enableNativeAccess(option);
+        enableNativeAccess.add(option);
     }
 
     public void setExperimental(boolean experimental) {
@@ -227,6 +266,21 @@ public void handleVMOption(String optionString) {
     }
 
     public void argumentProcessingDone() {
+        if (!addModules.isEmpty()) {
+            builder.option("java.AddModules", String.join(File.pathSeparator, addModules));
+        }
+        if (!addExports.isEmpty()) {
+            builder.option("java.AddExports", String.join(File.pathSeparator, addExports));
+        }
+        if (!addOpens.isEmpty()) {
+            builder.option("java.AddOpens", String.join(File.pathSeparator, addOpens));
+        }
+        if (!addReads.isEmpty()) {
+            builder.option("java.AddReads", String.join(File.pathSeparator, addReads));
+        }
+        if (!enableNativeAccess.isEmpty()) {
+            builder.option("java.EnableNativeAccess", String.join(File.pathSeparator, enableNativeAccess));
+        }
         printHelp();
         polyglotAccess.argumentProcessingDone();
     }