Remove ToJavaStringWithDefaultNode usage in CreateCast

Author: horakivo

src/main/java/org/truffleruby/interop/ToJavaStringWithDefaultNode.java

@@ -9,43 +9,31 @@
  */
 package org.truffleruby.interop;
 
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.language.NotProvided;
-import org.truffleruby.language.RubyContextSourceNode;
-import org.truffleruby.language.RubyNode;
+import org.truffleruby.language.RubyBaseNode;
 
 import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 
 /** Convert a Ruby String or Symbol to a Java string, or return a default string if a value was not provided. */
-@NodeChild(value = "valueNode", type = RubyNode.class)
-public abstract class ToJavaStringWithDefaultNode extends RubyContextSourceNode {
+@GenerateInline
+@GenerateCached(false)
+public abstract class ToJavaStringWithDefaultNode extends RubyBaseNode {
 
-    private final String defaultValue;
-
-    public ToJavaStringWithDefaultNode(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    abstract RubyNode getValueNode();
+    public abstract String execute(Node node, Object value, String defaultValue);
 
     @Specialization
-    protected String doDefault(NotProvided value) {
+    protected static String doDefault(NotProvided value, String defaultValue) {
         return defaultValue;
     }
 
     @Specialization(guards = "wasProvided(value)")
-    protected String doProvided(Object value,
+    protected static String doProvided(Node node, Object value, String defaultValue,
             @Cached ToJavaStringNode toJavaStringNode) {
-        return toJavaStringNode.execute(this, value);
-    }
-
-    @Override
-    public RubyNode cloneUninitialized() {
-        var copy = ToJavaStringWithDefaultNodeGen.create(
-                defaultValue,
-                getValueNode().cloneUninitialized());
-        return copy.copyFlags(this);
+        return toJavaStringNode.execute(node, value);
     }
 
 }

src/main/java/org/truffleruby/stdlib/readline/ReadlineNodes.java

@@ -44,13 +44,12 @@
 import org.truffleruby.core.support.RubyIO;
 import org.truffleruby.core.thread.ThreadManager.BlockingAction;
 import org.truffleruby.interop.ToJavaStringNode;
-import org.truffleruby.interop.ToJavaStringWithDefaultNodeGen;
+import org.truffleruby.interop.ToJavaStringWithDefaultNode;
 import org.truffleruby.language.RubyBaseNodeWithExecute;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.language.dispatch.DispatchNode;
@@ -122,20 +121,15 @@ protected RubyArray getScreenSize() {
     }
 
     @CoreMethod(names = "readline", isModuleFunction = true, optional = 2)
-    @NodeChild(value = "prompt", type = RubyNode.class)
-    @NodeChild(value = "addToHistory", type = RubyBaseNodeWithExecute.class)
-    public abstract static class ReadlineNode extends CoreMethodNode {
-
-        @CreateCast("prompt")
-        protected RubyNode coercePromptToJavaString(RubyNode prompt) {
-            return ToJavaStringWithDefaultNodeGen.create("", prompt);
-        }
+    public abstract static class ReadlineNode extends CoreMethodArrayArgumentsNode {
 
         @TruffleBoundary
         @Specialization
-        protected Object readline(String prompt, Object maybeAddToHistory,
+        protected Object readline(Object maybePromptObject, Object maybeAddToHistory,
+                @Cached ToJavaStringWithDefaultNode toJavaStringWithDefaultNode,
                 @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
                 @Cached BooleanCastWithDefaultNode booleanCastWithDefaultNode) {
+            final var prompt = toJavaStringWithDefaultNode.execute(this, maybePromptObject, "");
             final boolean addToHistory = booleanCastWithDefaultNode.execute(this, maybeAddToHistory, false);
             final LineReader readline = getContext().getConsoleHolder().getReadline();