Convert ForeignToRubyArgumentsNode to DSL inlinable node

Author: horakivo

src/main/java/org/truffleruby/core/method/RubyMethod.java

@@ -11,6 +11,8 @@
 
 import java.util.Set;
 
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.interop.ForeignToRubyArgumentsNode;
 import org.truffleruby.language.RubyDynamicObject;
@@ -69,8 +71,9 @@ public boolean isExecutable() {
     @ExportMessage
     public Object execute(Object[] arguments,
             @Cached ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
-            @Cached CallInternalMethodNode callInternalMethodNode) {
-        final Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(arguments);
+            @Cached CallInternalMethodNode callInternalMethodNode,
+            @Bind("$node") Node node) {
+        final Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(node, arguments);
         final Object[] frameArgs = RubyArguments.pack(null, null, method, null, receiver, nil,
                 EmptyArgumentsDescriptor.INSTANCE, convertedArguments);
         return callInternalMethodNode.execute(null, method, receiver, frameArgs);

src/main/java/org/truffleruby/core/proc/RubyProc.java

@@ -149,7 +149,7 @@ public Object execute(Object[] arguments,
             @Cached CallBlockNode yieldNode,
             @Cached ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
             @Bind("$node") Node node) {
-        return yieldNode.yield(node, this, foreignToRubyArgumentsNode.executeConvert(arguments));
+        return yieldNode.yield(node, this, foreignToRubyArgumentsNode.executeConvert(node, arguments));
     }
     // endregion
 }

src/main/java/org/truffleruby/interop/ForeignToRubyArgumentsNode.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 org.truffleruby.language.RubyBaseNode;
 
 import com.oracle.truffle.api.dsl.Cached;
@@ -17,15 +20,17 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
 @GenerateUncached
+@GenerateCached(false)
+@GenerateInline
 public abstract class ForeignToRubyArgumentsNode extends RubyBaseNode {
 
-    public abstract Object[] executeConvert(Object[] args);
+    public abstract Object[] executeConvert(Node node, Object[] args);
 
     @ExplodeLoop
     @Specialization(
             guards = { "args.length == cachedArgsLength", "cachedArgsLength <= MAX_EXPLODE_SIZE" },
             limit = "getLimit()")
-    Object[] convertCached(Object[] args,
+    static Object[] convertCached(Object[] args,
             @Cached("args.length") int cachedArgsLength,
             @Cached("foreignToRubyNodes(cachedArgsLength)") ForeignToRubyNode[] foreignToRubyNodes) {
         final Object[] convertedArgs = new Object[cachedArgsLength];
@@ -38,12 +43,12 @@ Object[] convertCached(Object[] args,
     }
 
     @Specialization(replaces = "convertCached")
-    Object[] convertUncached(Object[] args,
+    static Object[] convertUncached(Node node, Object[] args,
             @Cached ForeignToRubyNode foreignToRubyNode) {
         final Object[] convertedArgs = new Object[args.length];
 
         for (int n = 0; n < args.length; n++) {
-            convertedArgs[n] = foreignToRubyNode.execute(this, args[n]);
+            convertedArgs[n] = foreignToRubyNode.execute(node, args[n]);
         }
 
         return convertedArgs;

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

@@ -9,6 +9,8 @@
  */
 package org.truffleruby.interop;
 
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayUtils;
 import org.truffleruby.language.dispatch.DispatchNode;
@@ -49,7 +51,7 @@ protected Object send(Message message, Object[] rawArgs,
             @Cached DispatchNode dispatchNode,
             @Cached ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
             @CachedLibrary("this.delegate") ReflectionLibrary reflections,
-            @CachedLibrary("this") ReflectionLibrary node) throws Exception {
+            @Bind("$node") Node node) throws Exception {
 
         if (message == IS_META_INSTANCE) { // Workaround StackOverflowError in asserts (GR-37197)
             rawArgs = rawArgs.clone();
@@ -75,7 +77,7 @@ protected Object send(Message message, Object[] rawArgs,
                 }
             }
 
-            Object[] convertedArgs = foreignToRubyArgumentsNode.executeConvert(loggingArgs);
+            Object[] convertedArgs = foreignToRubyArgumentsNode.executeConvert(node, loggingArgs);
             dispatchNode.call(logger, "<<", convertedArgs);
         }
 

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

@@ -10,7 +10,9 @@
 package org.truffleruby.language;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.utilities.TriState;
 import org.truffleruby.RubyContext;
@@ -144,9 +146,10 @@ public boolean isMemberInvocable(String name,
     public Object invokeMember(String name, Object[] arguments,
             @Cached @Exclusive DispatchNode dispatchMember,
             @Cached @Exclusive ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
-            @Cached @Shared BranchProfile errorProfile)
+            @Cached @Shared BranchProfile errorProfile,
+            @Bind("$node") Node node)
             throws UnknownIdentifierException {
-        Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(arguments);
+        Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(node, arguments);
         Object result = dispatchMember.call(PRIVATE_RETURN_MISSING, this, name, convertedArguments);
         if (result == DispatchNode.MISSING) {
             errorProfile.enter();

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

@@ -670,9 +670,10 @@ public Object invokeMember(String name, Object[] arguments,
             @Cached @Exclusive ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
             @Cached @Shared ConditionProfile dynamicProfile,
             @Cached @Shared TranslateInteropRubyExceptionNode translateRubyException,
-            @Cached @Shared BranchProfile errorProfile)
+            @Cached @Shared BranchProfile errorProfile,
+            @Bind("$node") Node node)
             throws UnknownIdentifierException, UnsupportedTypeException, UnsupportedMessageException, ArityException {
-        Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(arguments);
+        Object[] convertedArguments = foreignToRubyArgumentsNode.executeConvert(node, arguments);
         Object[] combinedArguments = ArrayUtils.unshift(convertedArguments, name);
         Object dynamic;
         try {
@@ -877,10 +878,11 @@ public boolean isInstantiable(
     public Object instantiate(Object[] arguments,
             @Cached @Shared BranchProfile errorProfile,
             @Cached @Exclusive DispatchNode dispatchNode,
-            @Cached @Exclusive ForeignToRubyArgumentsNode foreignToRubyArgumentsNode)
+            @Cached @Exclusive ForeignToRubyArgumentsNode foreignToRubyArgumentsNode,
+            @Bind("$node") Node node)
             throws UnsupportedMessageException {
         Object instance = dispatchNode.call(PUBLIC_RETURN_MISSING, this, "new",
-                foreignToRubyArgumentsNode.executeConvert(arguments));
+                foreignToRubyArgumentsNode.executeConvert(node, arguments));
 
         // TODO (pitr-ch 28-Jan-2020): we should translate argument-error caused by bad arity to ArityException
         if (instance == DispatchNode.MISSING) {