Convert FromJavaStringNode to DSL inlinable

Author: horakivo

src/main/java/org/truffleruby/core/TruffleSystemNodes.java

@@ -116,7 +116,7 @@ protected static Object javaGetEnv(Object name,
             if (nullValueProfile.profile(node, value == null)) {
                 return nil;
             } else {
-                return fromJavaStringNode.executeFromJavaString(value);
+                return fromJavaStringNode.executeFromJavaString(node, value);
             }
         }
 

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

@@ -1396,7 +1396,7 @@ public abstract static class PrimitiveNamesNode extends CoreMethodArrayArguments
         @Specialization
         protected RubyArray primitiveNames() {
             var primitiveNames = getLanguage().primitiveManager.getPrimitiveNames().stream()
-                    .map(name -> FromJavaStringNodeGen.getUncached().executeFromJavaString(name));
+                    .map(name -> FromJavaStringNodeGen.getUncached().executeFromJavaString(this, name));
 
             return createArray(primitiveNames.toArray());
         }

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

@@ -9,6 +9,9 @@
  */
 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 com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.encoding.Encodings;
 import org.truffleruby.core.string.RubyString;
@@ -19,34 +22,37 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 
+@GenerateInline
+@GenerateCached(false)
 @GenerateUncached
 public abstract class FromJavaStringNode extends RubyBaseNode {
 
-    public abstract RubyString executeFromJavaString(String value);
+    public abstract RubyString executeFromJavaString(Node node, String value);
 
     @Specialization(guards = "stringsEquals(cachedValue, value)", limit = "getLimit()")
-    protected RubyString doCached(String value,
+    protected static RubyString doCached(Node node, String value,
             @Cached("value") String cachedValue,
-            @Shared @Cached TruffleString.FromJavaStringNode tstringFromJavaStringNode,
+            @Cached(inline = false) @Shared TruffleString.FromJavaStringNode tstringFromJavaStringNode,
             @Cached("getTString(cachedValue, tstringFromJavaStringNode)") TruffleString cachedTString) {
-        var rubyString = createString(cachedTString, Encodings.UTF_8);
+        var rubyString = createString(node, cachedTString, Encodings.UTF_8);
         rubyString.freeze();
         return rubyString;
     }
 
     @Specialization(replaces = "doCached")
-    protected RubyString doGeneric(String value,
-            @Shared @Cached TruffleString.FromJavaStringNode tstringFromJavaStringNode) {
-        var rubyString = createString(tstringFromJavaStringNode, value, Encodings.UTF_8);
+    protected static RubyString doGeneric(Node node, String value,
+            @Cached(inline = false) @Shared TruffleString.FromJavaStringNode tstringFromJavaStringNode) {
+        var rubyString = createString(node, tstringFromJavaStringNode, value, Encodings.UTF_8);
         rubyString.freeze();
         return rubyString;
     }
 
-    protected boolean stringsEquals(String a, String b) {
+    protected static boolean stringsEquals(String a, String b) {
         return a.equals(b);
     }
 
-    protected TruffleString getTString(String value, TruffleString.FromJavaStringNode tstringFromJavaStringNode) {
+    protected static TruffleString getTString(String value,
+            TruffleString.FromJavaStringNode tstringFromJavaStringNode) {
         return tstringFromJavaStringNode.execute(value, TruffleString.Encoding.UTF_8);
     }
 

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

@@ -1669,9 +1669,10 @@ protected boolean hasLanguage(Object receiver,
     public abstract static class GetLanguageNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization(limit = "getInteropCacheLimit()")
-        protected Object getLanguage(Object receiver,
+        protected static Object getLanguage(Object receiver,
                 @CachedLibrary("receiver") InteropLibrary receivers,
-                @Cached FromJavaStringNode fromJavaStringNode) {
+                @Cached FromJavaStringNode fromJavaStringNode,
+                @Bind("this") Node node) {
             if (!receivers.hasLanguage(receiver)) {
                 return nil;
             }
@@ -1684,11 +1685,11 @@ protected Object getLanguage(Object receiver,
             }
 
             final String name = languageClassToLanguageName(language);
-            return fromJavaStringNode.executeFromJavaString(name);
+            return fromJavaStringNode.executeFromJavaString(node, name);
         }
 
         @TruffleBoundary
-        private String languageClassToLanguageName(Class<? extends TruffleLanguage<?>> language) {
+        private static String languageClassToLanguageName(Class<? extends TruffleLanguage<?>> language) {
             String name = language.getSimpleName();
             if (name.endsWith("Language")) {
                 name = name.substring(0, name.length() - "Language".length());

src/main/java/org/truffleruby/language/RubyBaseNode.java

@@ -278,8 +278,14 @@ protected final RubyString createString(TruffleString.FromByteArrayNode fromByte
 
     public final RubyString createString(TruffleString.FromJavaStringNode fromJavaStringNode, String javaString,
             RubyEncoding encoding) {
+        return createString(this, fromJavaStringNode, javaString, encoding);
+    }
+
+    public static RubyString createString(Node node, TruffleString.FromJavaStringNode fromJavaStringNode,
+            String javaString,
+            RubyEncoding encoding) {
         var tstring = fromJavaStringNode.execute(javaString, encoding.tencoding);
-        return createString(tstring, encoding);
+        return createString(node, tstring, encoding);
     }
 
     protected final RubyString createSubString(TruffleString.SubstringByteIndexNode substringNode,