[GR-17457] Cleanup RubyLauncher and update comment

PullRequest: truffleruby/4244
oracle · Apr 18, 2024 · 401e061 · 401e061
2 parents 11f1b26 + fbe2dea
commit 401e061
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java b/src/launcher/java/org/truffleruby/launcher/RubyLauncher.java
@@ -87,10 +87,6 @@ protected String getMainClass() {
         return RubyLauncher.class.getName();
     }
 
-    @Override
-    protected void validateArguments(Map<String, String> polyglotOptions) {
-    }
-
     @Override
     protected void printVersion() {
         getOutput().println(TruffleRuby.getVersionString(getImplementationNameFromEngine()));
@@ -131,10 +127,11 @@ protected List<String> preprocessArguments(List<String> args, Map<String, String
             if (config.readRubyOptEnv) {
                 /* Calling processArguments() here will also add any unrecognized arguments such as
                  * --jvm/--native/--vm.* arguments and polyglot options to `config.getUnknownArguments()`, which will
-                 * then be processed by AbstractLanguageLauncher and Launcher. If we are going to run Native, Launcher
-                 * will apply VM options to the current process. If we are going to run on JVM, Launcher will collect
-                 * them and pass them when execve()'ing to bin/java. Polyglot options are parsed by
-                 * AbstractLanguageLauncher in the final process. */
+                 * then be processed by AbstractLanguageLauncher. For VM arguments, #validateVmArguments() will be
+                 * called to check that the guessed --vm.* arguments match the actual ones (should always be the case,
+                 * except if --vm.* arguments are added dynamically like --vm.Xmn1g for gem/bundle on native). If they
+                 * do not match then the thin launcher will relaunch by execve(). Polyglot options are parsed by
+                 * AbstractLanguageLauncher#parseUnrecognizedOptions. */
                 // Process RUBYOPT
                 final List<String> rubyoptArgs = getArgsFromEnvVariable("RUBYOPT");
                 new CommandLineParser(rubyoptArgs, config, false, true).processArguments();
@@ -382,7 +379,7 @@ private static List<String> getArgsFromEnvVariable(String name) {
         String value = System.getenv(name);
         if (value != null) {
             value = value.strip();
-            if (value.length() != 0) {
+            if (!value.isEmpty()) {
                 return new ArrayList<>(Arrays.asList(value.split("\\s+")));
             }
         }
@@ -391,7 +388,7 @@ private static List<String> getArgsFromEnvVariable(String name) {
 
     private static List<String> getPathListFromEnvVariable(String name) {
         final String value = System.getenv(name);
-        if (value != null && value.length() != 0) {
+        if (value != null && !value.isEmpty()) {
             return new ArrayList<>(Arrays.asList(value.split(":")));
         }
         return Collections.emptyList();

diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -446,9 +446,9 @@ public abstract static class MarkObjectOnCallExit extends PrimitiveArrayArgument
 
         @Specialization
         Object markOnCallExit(Object object,
-                @Cached WrapNode wrapNode,
-                @Cached MarkingServiceNodes.QueueForMarkOnExitNode markOnExitNode) {
-            markOnExitNode.execute(wrapNode.execute(object));
+                @Cached WrapNode wrapNode) {
+            ValueWrapper wrapper = wrapNode.execute(object);
+            getLanguage().getCurrentThread().getCurrentFiber().extensionCallStack.markOnExitObject(wrapper);
             return nil;
         }
     }

diff --git a/src/main/java/org/truffleruby/core/MarkingServiceNodes.java b/src/main/java/org/truffleruby/core/MarkingServiceNodes.java
@@ -11,7 +11,6 @@
 
 import com.oracle.truffle.api.dsl.GenerateCached;
 import com.oracle.truffle.api.dsl.GenerateInline;
-import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.NonIdempotent;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
@@ -76,22 +75,6 @@ protected static ExtensionCallStack getStack(Node node) {
         }
     }
 
-    public static final class QueueForMarkOnExitNode extends RubyBaseNode {
-
-        @NeverDefault
-        public static QueueForMarkOnExitNode create() {
-            return new QueueForMarkOnExitNode();
-        }
-
-        public void execute(ValueWrapper object) {
-            addToList(getLanguage().getCurrentThread().getCurrentFiber().extensionCallStack, object);
-        }
-
-        protected void addToList(ExtensionCallStack stack, ValueWrapper object) {
-            stack.markOnExitObject(object);
-        }
-    }
-
     @GenerateInline
     @GenerateCached(false)
     public abstract static class RunMarkOnExitNode extends RubyBaseNode {