[GR-14896] Fix native launcher in JVM mode.

eregon · eregon · commit 6d24f62f8281 · 2019-04-02T08:48:55.000-07:00
PullRequest: truffleruby/764
diff --git a/src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java b/src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java
@@ -34,6 +34,8 @@
 import org.truffleruby.shared.options.StringArrayOptionType;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -43,23 +45,34 @@ public class CommandLineOptions {
     boolean showVersion = false;
     boolean showCopyright = false;
     ShowHelp showHelp = ShowHelp.NONE;
+    /** Read the RUBYOPT and TRUFFLERUBYOPT environment variables */
+    boolean readRubyOptEnv = true;
     /** What should be done after context is created */
     ExecutionAction executionAction = ExecutionAction.NONE;
     /** What should be done when no action is set */
     DefaultExecutionAction defaultExecutionAction = DefaultExecutionAction.IRB;
     /** A thing to be executed: a file, inline script, etc. Used by executionAction when applicable. */
     String toExecute = "";
 
-    private Map<String, String> options;
+    /** This should not be modified, as otherwise when exec()-ing to JVM from a native launcher,
+     * these options would be passed on the command line, which fails if they are experimental.
+     * This would also cause parsing the options twice with the current Launcher design. */
+    private final Map<String, String> polyglotOptions;
+    private final Map<String, String> options;
     private String[] arguments;
     private final List<String> unknownArguments;
 
-    public CommandLineOptions(Map<String, String> options) {
-        this.options = options;
-        this.arguments = new String[]{};
+    public CommandLineOptions(Map<String, String> polyglotOptions) {
+        this.polyglotOptions = Collections.unmodifiableMap(polyglotOptions);
+        this.options = new HashMap<>();
+        this.arguments = new String[0];
         this.unknownArguments = new ArrayList<>();
     }
 
+    boolean isSetInPolyglotOptions(String optionName) {
+        return polyglotOptions.containsKey(optionName);
+    }
+
     public Map<String, String> getOptions() {
         return options;
     }
diff --git a/src/launcher/java/org/truffleruby/launcher/CommandLineParser.java b/src/launcher/java/org/truffleruby/launcher/CommandLineParser.java
@@ -599,15 +599,13 @@ private CommandLineException notImplemented(String option) {
                 FEATURES.get("gem"));
 
         FEATURES.put("frozen-string-literal",
-                (processor, enable) -> processor.config.setOption(
-                        OptionsCatalog.FROZEN_STRING_LITERALS,
-                        enable));
+                (processor, enable) -> processor.config.setOption(OptionsCatalog.FROZEN_STRING_LITERALS, enable));
 
         FEATURES.put("frozen_string_literal",
                 FEATURES.get("frozen-string-literal"));
 
         FEATURES.put("rubyopt",
-                (processor, enable) -> processor.config.setOption(OptionsCatalog.READ_RUBYOPT, enable));
+                (processor, enable) -> processor.config.readRubyOptEnv = enable);
     }
 
     private static Logger createLogger() {
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -68,7 +68,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             final CommandLineParser argumentCommandLineParser = new CommandLineParser(args, config, true, false);
             argumentCommandLineParser.processArguments();
 
-            if ((boolean) config.getOption(OptionsCatalog.READ_RUBYOPT)) {
+            if (config.readRubyOptEnv) {
                 // Process RUBYOPT
                 final List<String> rubyoptArgs = getArgsFromEnvVariable("RUBYOPT");
                 new CommandLineParser(rubyoptArgs, config, false, true).processArguments();
@@ -89,7 +89,7 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
                      * therefore this is not done on JVM.
                      */
                     final int index = argumentCommandLineParser.getLastInterpreterArgumentIndex();
-                    args.add(index, "--read_rubyopt=false");
+                    args.add(index, "--disable=rubyopt");
                     args.addAll(index + 1, rubyoptArgs);
                     args.addAll(index + 1 + rubyoptArgs.size(), trufflerubyoptArgs);
                 }
@@ -101,13 +101,6 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
                 config.appendOptionValue(OptionsCatalog.LOAD_PATHS, path);
             }
 
-            if (isAOT()) {
-                final String launcher = setRubyLauncher();
-                if (launcher != null) {
-                    polyglotOptions.put(OptionsCatalog.LAUNCHER.getName(), launcher);
-                }
-            }
-
         } catch (CommandLineException commandLineException) {
             System.err.println(TruffleRuby.SIMPLE_NAME + ": " + commandLineException.getMessage());
             if (commandLineException.isUsageError()) {
@@ -248,10 +241,17 @@ private static void debugPreInitialization() {
     }
 
     private Context createContext(Context.Builder builder, CommandLineOptions config) {
-        if (!config.getOptions().containsKey(OptionsCatalog.EMBEDDED.getName())) {
-            builder.option(OptionsCatalog.EMBEDDED.getName(), Boolean.FALSE.toString());
+        if (isAOT() && !config.isSetInPolyglotOptions(OptionsCatalog.LAUNCHER.getName())) {
+            final String launcher = ProcessProperties.getExecutableName();
+            builder.option(OptionsCatalog.LAUNCHER.getName(), launcher);
+        }
+
+        if (!config.isSetInPolyglotOptions(OptionsCatalog.EMBEDDED.getName())) {
+            builder.option(OptionsCatalog.EMBEDDED.getName(), "false");
         }
 
+        builder.options(config.getOptions());
+
         builder.arguments(TruffleRuby.LANGUAGE_ID, config.getArguments());
 
         return builder.build();
@@ -276,15 +276,6 @@ private static List<String> getPathListFromEnvVariable(String name) {
         return Collections.emptyList();
     }
 
-    private String setRubyLauncher() {
-        if (String.class.cast(config.getOption(OptionsCatalog.LAUNCHER)).isEmpty()) {
-            final String launcher = ProcessProperties.getExecutableName();
-            config.setOption(OptionsCatalog.LAUNCHER, launcher);
-            return launcher;
-        }
-        return null;
-    }
-
     private static void printPreRunInformation(CommandLineOptions config) {
         if (config.showVersion) {
             System.out.println(TruffleRuby.getVersionString(getImplementationNameFromEngine(), isAOT()));
diff --git a/src/main/java/org/truffleruby/options/Options.java b/src/main/java/org/truffleruby/options/Options.java
@@ -80,7 +80,6 @@ public class Options {
     public final boolean ARGV_GLOBALS;
     public final boolean IGNORE_LINES_BEFORE_RUBY_SHEBANG;
     public final boolean SYNTAX_CHECK;
-    public final boolean READ_RUBYOPT;
     public final String[] ARGV_GLOBAL_VALUES;
     public final String[] ARGV_GLOBAL_FLAGS;
     public final boolean BUILDING_CORE_CEXTS;
@@ -207,7 +206,6 @@ public Options(Env env, OptionValues options) {
         ARGV_GLOBALS = options.get(OptionsCatalog.ARGV_GLOBALS_KEY);
         IGNORE_LINES_BEFORE_RUBY_SHEBANG = options.get(OptionsCatalog.IGNORE_LINES_BEFORE_RUBY_SHEBANG_KEY);
         SYNTAX_CHECK = options.get(OptionsCatalog.SYNTAX_CHECK_KEY);
-        READ_RUBYOPT = options.get(OptionsCatalog.READ_RUBYOPT_KEY);
         ARGV_GLOBAL_VALUES = options.get(OptionsCatalog.ARGV_GLOBAL_VALUES_KEY);
         ARGV_GLOBAL_FLAGS = options.get(OptionsCatalog.ARGV_GLOBAL_FLAGS_KEY);
         BUILDING_CORE_CEXTS = options.get(OptionsCatalog.BUILDING_CORE_CEXTS_KEY);
@@ -393,8 +391,6 @@ public Object fromDescriptor(OptionDescriptor descriptor) {
                 return IGNORE_LINES_BEFORE_RUBY_SHEBANG;
             case "ruby.syntax_check":
                 return SYNTAX_CHECK;
-            case "ruby.read_rubyopt":
-                return READ_RUBYOPT;
             case "ruby.argv_global_values":
                 return ARGV_GLOBAL_VALUES;
             case "ruby.argv_global_flags":
diff --git a/src/options.yml b/src/options.yml
@@ -85,7 +85,6 @@ INTERNAL: # Options for debugging the TruffleRuby implementation
     SYNTAX_CHECK: [[syntax_check, -c], boolean, false, Do not execute just check syntax]
 
     # Used internally for the launcher to communicate with the RubyContext
-    READ_RUBYOPT: [read_rubyopt, boolean, true, Read RUBYOPT and TRUFFLERUBYOPT environment variables]
     ARGV_GLOBAL_VALUES: [argv_global_values, string-array, [], Parsed options from script argv with a value]
     ARGV_GLOBAL_FLAGS: [argv_global_flags, string-array, [], Parsed options from script argv acting as flags (no value)]
     BUILDING_CORE_CEXTS: [building.core.cexts, boolean, false, 'Used while building TruffleRuby to build core C extensions']
diff --git a/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java b/src/shared/java/org/truffleruby/shared/options/OptionsCatalog.java
@@ -78,7 +78,6 @@ public class OptionsCatalog {
     public static final OptionKey<Boolean> ARGV_GLOBALS_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> IGNORE_LINES_BEFORE_RUBY_SHEBANG_KEY = new OptionKey<>(false);
     public static final OptionKey<Boolean> SYNTAX_CHECK_KEY = new OptionKey<>(false);
-    public static final OptionKey<Boolean> READ_RUBYOPT_KEY = new OptionKey<>(true);
     public static final OptionKey<String[]> ARGV_GLOBAL_VALUES_KEY = new OptionKey<>(new String[]{}, StringArrayOptionType.INSTANCE);
     public static final OptionKey<String[]> ARGV_GLOBAL_FLAGS_KEY = new OptionKey<>(new String[]{}, StringArrayOptionType.INSTANCE);
     public static final OptionKey<Boolean> BUILDING_CORE_CEXTS_KEY = new OptionKey<>(false);
@@ -546,13 +545,6 @@ public class OptionsCatalog {
             .stability(OptionStability.EXPERIMENTAL)
             .build();
 
-    public static final OptionDescriptor READ_RUBYOPT = OptionDescriptor
-            .newBuilder(READ_RUBYOPT_KEY, "ruby.read_rubyopt")
-            .help("Read RUBYOPT and TRUFFLERUBYOPT environment variables")
-            .category(OptionCategory.INTERNAL)
-            .stability(OptionStability.EXPERIMENTAL)
-            .build();
-
     public static final OptionDescriptor ARGV_GLOBAL_VALUES = OptionDescriptor
             .newBuilder(ARGV_GLOBAL_VALUES_KEY, "ruby.argv_global_values")
             .help("Parsed options from script argv with a value")
@@ -1138,8 +1130,6 @@ public static OptionDescriptor fromName(String name) {
                 return IGNORE_LINES_BEFORE_RUBY_SHEBANG;
             case "ruby.syntax_check":
                 return SYNTAX_CHECK;
-            case "ruby.read_rubyopt":
-                return READ_RUBYOPT;
             case "ruby.argv_global_values":
                 return ARGV_GLOBAL_VALUES;
             case "ruby.argv_global_flags":
@@ -1377,7 +1367,6 @@ public static OptionDescriptor[] allDescriptors() {
             POLYGLOT_STDIO,
             PREINITIALIZATION,
             PRIMITIVE_CALLERS_ALWAYS_CLONE,
-            READ_RUBYOPT,
             REGEXP_INSTRUMENT_CREATION,
             REGEXP_INSTRUMENT_MATCH,
             REQUIRED_LIBRARIES,
