Simplify logic for launcher options with a different default

(cherry picked from commit 3e9a83d)

Author: eregon

src/launcher/java/org/truffleruby/launcher/CommandLineOptions.java

@@ -31,7 +31,6 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,26 +57,17 @@ public class CommandLineOptions {
     /** A thing to be executed: a file, inline script, etc. Used by executionAction when applicable. */
     String toExecute = "";
 
-    /** 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;
     private Boolean gemOrBundle = null;
 
-    public CommandLineOptions(Map<String, String> polyglotOptions) {
-        this.polyglotOptions = Collections.unmodifiableMap(polyglotOptions);
+    public CommandLineOptions() {
         this.options = new HashMap<>();
         this.arguments = EMPTY_STRING_ARRAY;
         this.unknownArguments = new ArrayList<>();
     }
 
-    boolean isSetInPolyglotOptions(String optionName) {
-        return polyglotOptions.containsKey(optionName);
-    }
-
     public Map<String, String> getOptions() {
         return options;
     }

src/launcher/java/org/truffleruby/launcher/RubyLauncher.java

@@ -61,7 +61,15 @@ protected void printVersion() {
 
     @Override
     protected List<String> preprocessArguments(List<String> args, Map<String, String> polyglotOptions) {
-        config = new CommandLineOptions(polyglotOptions);
+        // Set default options for the launcher which don't match the OptionKey's default.
+        // These options can still be overridden if set explicitly.
+        polyglotOptions.put(OptionsCatalog.EMBEDDED.getName(), "false");
+        if (isAOT()) {
+            final String launcher = ProcessProperties.getExecutableName();
+            polyglotOptions.put(OptionsCatalog.LAUNCHER.getName(), launcher);
+        }
+
+        config = new CommandLineOptions();
 
         try {
             config.executionAction = ExecutionAction.UNSET;
@@ -236,15 +244,6 @@ private int runRubyMain(Context.Builder contextBuilder, CommandLineOptions confi
     }
 
     private Context createContext(Context.Builder builder, CommandLineOptions config) {
-        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");
-        }
-
         if (config.isGemOrBundle() && getImplementationNameFromEngine().contains("Graal")) {
             // Apply options to run gem/bundle more efficiently
             builder.option("engine.Mode", "latency");