Convert UnwrapNode to DSL inlinable

horakivo · horakivo · commit 2c0afc789880 · 2023-05-29T12:57:48.000+02:00
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
@@ -252,7 +252,7 @@ protected Object callWithCExtLockAndFrame(
                         MutexOperations.lockInternal(getContext(), lock, this);
                     }
                     try {
-                        return unwrapNode.execute(
+                        return unwrapNode.execute(this,
                                 InteropNodes.execute(receiver, args, receivers, translateInteropExceptionNode));
                     } finally {
                         runMarksNode.execute(extensionStack);
@@ -262,7 +262,7 @@ protected Object callWithCExtLockAndFrame(
                     }
                 } else {
                     try {
-                        return unwrapNode.execute(
+                        return unwrapNode.execute(this,
                                 InteropNodes.execute(receiver, args, receivers, translateInteropExceptionNode));
                     } finally {
                         runMarksNode.execute(extensionStack);
@@ -1761,7 +1761,7 @@ public abstract static class UnwrapValueNode extends PrimitiveArrayArgumentsNode
         protected Object unwrap(Object value,
                 @Cached InlinedBranchProfile exceptionProfile,
                 @Cached UnwrapNode unwrapNode) {
-            Object object = unwrapNode.execute(value);
+            Object object = unwrapNode.execute(this, value);
             if (object == null) {
                 exceptionProfile.enter(this);
                 throw new RaiseException(getContext(), coreExceptions().runtimeError(exceptionMessage(value), this));
diff --git a/src/main/java/org/truffleruby/cext/IDToSymbolNode.java b/src/main/java/org/truffleruby/cext/IDToSymbolNode.java
@@ -48,7 +48,7 @@ protected RubySymbol unwrapStaticSymbol(long value,
     @Specialization(guards = "!isStaticSymbol(value)")
     protected RubySymbol unwrapDynamicSymbol(Object value,
             @Cached UnwrapNode unwrapNode) {
-        return (RubySymbol) unwrapNode.execute(value);
+        return (RubySymbol) unwrapNode.execute(this, value);
     }
 
     public static boolean isStaticSymbol(Object value) {
diff --git a/src/main/java/org/truffleruby/cext/UnwrapNode.java b/src/main/java/org/truffleruby/cext/UnwrapNode.java
@@ -16,8 +16,11 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.language.NotProvided;
@@ -36,6 +39,8 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 
 @GenerateUncached
+@GenerateInline
+@GenerateCached(false)
 @ImportStatic(ValueWrapperManager.class)
 public abstract class UnwrapNode extends RubyBaseNode {
 
@@ -194,7 +199,7 @@ protected Object[] unwrapCArrayExplode(Object cArray,
             final Object[] store = new Object[cachedSize];
             for (int i = 0; i < cachedSize; i++) {
                 final Object cValue = readArrayElement(cArray, interop, i);
-                store[i] = unwrapNode.execute(cValue);
+                store[i] = unwrapNode.execute(this, cValue);
             }
             return store;
         }
@@ -210,7 +215,7 @@ protected Object[] unwrapCArray(Object cArray,
             try {
                 for (; loopProfile.inject(i < size); i++) {
                     final Object cValue = readArrayElement(cArray, interop, i);
-                    store[i] = unwrapNode.execute(cValue);
+                    store[i] = unwrapNode.execute(this, cValue);
                     TruffleSafepoint.poll(this);
                 }
             } finally {
@@ -236,35 +241,35 @@ private static Object readArrayElement(Object cArray, InteropLibrary interop, in
         }
     }
 
-    public abstract Object execute(Object value);
+    public abstract Object execute(Node node, Object value);
 
     @Specialization(guards = "!isTaggedLong(value.getHandle())")
-    protected Object unwrapValueObject(ValueWrapper value) {
+    protected static Object unwrapValueObject(ValueWrapper value) {
         return value.getObject();
     }
 
     @Specialization(guards = "isTaggedLong(value.getHandle())")
-    protected long unwrapValueTaggedLong(ValueWrapper value) {
+    protected static long unwrapValueTaggedLong(ValueWrapper value) {
         return ValueWrapperManager.untagTaggedLong(value.getHandle());
     }
 
     @Specialization
-    protected Object longToWrapper(long value,
+    protected static Object longToWrapper(long value,
             @Cached @Shared UnwrapNativeNode unwrapNativeNode) {
         return unwrapNativeNode.execute(value);
     }
 
     @Specialization(guards = { "!isWrapper(value)", "!isImplicitLong(value)" })
-    protected Object unwrapGeneric(Object value,
+    protected static Object unwrapGeneric(Node node, Object value,
             @CachedLibrary(limit = "getCacheLimit()") InteropLibrary values,
             @Cached @Shared UnwrapNativeNode unwrapNativeNode,
             @Cached InlinedBranchProfile unsupportedProfile) {
         long handle;
         try {
             handle = values.asPointer(value);
         } catch (UnsupportedMessageException e) {
-            unsupportedProfile.enter(this);
-            throw new RaiseException(getContext(), coreExceptions().argumentError(e.getMessage(), this, e));
+            unsupportedProfile.enter(node);
+            throw new RaiseException(getContext(node), coreExceptions(node).argumentError(e.getMessage(), node, e));
         }
         return unwrapNativeNode.execute(handle);
     }
diff --git a/src/main/java/org/truffleruby/cext/ValueWrapperManager.java b/src/main/java/org/truffleruby/cext/ValueWrapperManager.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.annotations.SuppressFBWarnings;
@@ -396,8 +398,9 @@ protected boolean isExecutable() {
 
         @ExportMessage
         protected Object execute(Object[] arguments,
-                @Cached UnwrapNode unwrapNode) {
-            return unwrapNode.execute(arguments[0]);
+                @Cached UnwrapNode unwrapNode,
+                @Bind("$node") Node node) {
+            return unwrapNode.execute(node, arguments[0]);
         }
     }
 
@@ -429,8 +432,9 @@ protected boolean isExecutable() {
         @ExportMessage
         public Object execute(Object[] arguments,
                 @Cached UnwrapNode unwrapNode,
-                @Cached SymbolToIDNode symbolTOIDNode) {
-            return symbolTOIDNode.execute(unwrapNode.execute(arguments[0]));
+                @Cached SymbolToIDNode symbolTOIDNode,
+                @Bind("$node") Node node) {
+            return symbolTOIDNode.execute(unwrapNode.execute(node, arguments[0]));
         }
     }
 
diff --git a/src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java b/src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java
@@ -93,8 +93,9 @@ protected static String toString(NativeArrayStorage storage) {
 
     @ExportMessage
     protected Object read(int index,
-            @Shared @Cached UnwrapNode unwrapNode) {
-        return unwrapNode.execute(readElement(index));
+            @Shared @Cached UnwrapNode unwrapNode,
+            @Bind("$node") Node node) {
+        return unwrapNode.execute(node, readElement(index));
     }
 
     @ExportMessage
@@ -140,10 +141,11 @@ protected NativeArrayStorage expand(int newCapacity,
 
     @ExportMessage
     protected Object[] boxedCopyOfRange(int start, int length,
-            @Shared @Cached UnwrapNode unwrapNode) {
+            @Shared @Cached UnwrapNode unwrapNode,
+            @Bind("$node") Node node) {
         Object[] newStore = new Object[length];
         for (int i = 0; i < length; i++) {
-            newStore[i] = unwrapNode.execute(readElement(start + i));
+            newStore[i] = unwrapNode.execute(node, readElement(start + i));
         }
         return newStore;
     }
@@ -205,11 +207,12 @@ protected static void fill(NativeArrayStorage store, int start, int length, Obje
 
     @ExportMessage
     protected Object[] toJavaArrayCopy(int size,
-            @Shared @Cached UnwrapNode unwrapNode) {
+            @Shared @Cached UnwrapNode unwrapNode,
+            @Bind("$node") Node node) {
         Object[] newStore = new Object[size];
         assert size >= length;
         for (int i = 0; i < length; i++) {
-            newStore[i] = unwrapNode.execute(readElement(i));
+            newStore[i] = unwrapNode.execute(node, readElement(i));
         }
         return newStore;
     }
diff --git a/src/main/java/org/truffleruby/core/format/read/array/ReadCStringNode.java b/src/main/java/org/truffleruby/core/format/read/array/ReadCStringNode.java
@@ -37,7 +37,7 @@ protected Object read(Object pointer,
             @Cached UnwrapNode unwrapNode,
             @Cached TranslateInteropExceptionNode translateInteropExceptionNode,
             @CachedLibrary("stringReader") InteropLibrary stringReaders) {
-        Object string = unwrapNode.execute(InteropNodes.execute(
+        Object string = unwrapNode.execute(this, InteropNodes.execute(
                 stringReader,
                 new Object[]{ pointer },
                 stringReaders,
diff --git a/src/main/java/org/truffleruby/core/format/read/array/ReadCValueNode.java b/src/main/java/org/truffleruby/core/format/read/array/ReadCValueNode.java
@@ -22,6 +22,6 @@ public abstract class ReadCValueNode extends FormatNode {
     @Specialization
     protected Object read(Object source,
             @Cached UnwrapNode unwrapNode) {
-        return unwrapNode.execute(source);
+        return unwrapNode.execute(this, source);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected RubySymbol unwrapStaticSymbol(long value,`
`48`	`48`	`@Specialization(guards = "!isStaticSymbol(value)")`
`49`	`49`	`protected RubySymbol unwrapDynamicSymbol(Object value,`
`50`	`50`	`@Cached UnwrapNode unwrapNode) {`
`51`		`- return (RubySymbol) unwrapNode.execute(value);`
	`51`	`+ return (RubySymbol) unwrapNode.execute(this, value);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public static boolean isStaticSymbol(Object value) {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public abstract class ReadCValueNode extends FormatNode {`
`22`	`22`	`@Specialization`
`23`	`23`	`protected Object read(Object source,`
`24`	`24`	`@Cached UnwrapNode unwrapNode) {`
`25`		`- return unwrapNode.execute(source);`
	`25`	`+ return unwrapNode.execute(this, source);`
`26`	`26`	`}`
`27`	`27`	`}`