Addressing truffle-inlining warnings in cext package

horakivo · horakivo · commit 0a0afb4af14a · 2023-05-24T13:44:24.000+02:00
diff --git a/src/main/java/org/truffleruby/cext/CExtNodes.java b/src/main/java/org/truffleruby/cext/CExtNodes.java
diff --git a/src/main/java/org/truffleruby/cext/IDToSymbolNode.java b/src/main/java/org/truffleruby/cext/IDToSymbolNode.java
@@ -11,6 +11,7 @@
 
 import static org.truffleruby.core.symbol.CoreSymbols.idToIndex;
 
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.core.symbol.CoreSymbols;
 import org.truffleruby.core.symbol.RubySymbol;
@@ -21,7 +22,6 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 @GenerateUncached
 @ReportPolymorphism
@@ -31,11 +31,11 @@ public abstract class IDToSymbolNode extends RubyBaseNode {
 
     @Specialization(guards = "isStaticSymbol(value)")
     protected RubySymbol unwrapStaticSymbol(long value,
-            @Cached BranchProfile errorProfile) {
+            @Cached InlinedBranchProfile errorProfile) {
         final int index = idToIndex(value);
         final RubySymbol symbol = getLanguage().coreSymbols.STATIC_SYMBOLS[index];
         if (symbol == null) {
-            errorProfile.enter();
+            errorProfile.enter(this);
             throw new RaiseException(
                     getContext(),
                     coreExceptions().runtimeError(
diff --git a/src/main/java/org/truffleruby/cext/SymbolToIDNode.java b/src/main/java/org/truffleruby/cext/SymbolToIDNode.java
@@ -9,6 +9,7 @@
  */
 package org.truffleruby.cext;
 
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.core.symbol.RubySymbol;
 import org.truffleruby.language.RubyBaseNode;
 
@@ -17,7 +18,6 @@
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @GenerateUncached
 @ReportPolymorphism
@@ -36,8 +36,8 @@ protected Object getIDCached(RubySymbol symbol,
     @Specialization(replaces = "getIDCached")
     protected Object getIDUncached(RubySymbol symbol,
             @Cached @Shared WrapNode wrapNode,
-            @Cached ConditionProfile staticSymbolProfile) {
-        if (staticSymbolProfile.profile(symbol.getId() != RubySymbol.UNASSIGNED_ID)) {
+            @Cached InlinedConditionProfile staticSymbolProfile) {
+        if (staticSymbolProfile.profile(this, symbol.getId() != RubySymbol.UNASSIGNED_ID)) {
             return symbol.getId();
         }
         return wrapNode.execute(symbol);
diff --git a/src/main/java/org/truffleruby/cext/UnwrapNode.java b/src/main/java/org/truffleruby/cext/UnwrapNode.java
@@ -18,6 +18,8 @@
 import com.oracle.truffle.api.dsl.Bind;
 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;
 import org.truffleruby.language.RubyBaseNode;
@@ -34,7 +36,6 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 @GenerateUncached
 @ImportStatic(ValueWrapperManager.class)
@@ -73,12 +74,12 @@ protected long unwrapTaggedLong(long handle) {
 
         @Specialization(guards = "isTaggedObject(handle)")
         protected Object unwrapTaggedObject(long handle,
-                @Cached BranchProfile noHandleProfile) {
+                @Cached InlinedBranchProfile noHandleProfile) {
             final ValueWrapper wrapper = getContext()
                     .getValueWrapperManager()
                     .getWrapperFromHandleMap(handle, getLanguage());
             if (wrapper == null) {
-                noHandleProfile.enter();
+                noHandleProfile.enter(this);
                 raiseError(handle);
             }
             return wrapper.getObject();
@@ -159,16 +160,17 @@ protected ValueWrapper longToWrapper(long value,
         }
 
         @Specialization(guards = { "!isWrapper(value)", "values.isPointer(value)" }, limit = "getCacheLimit()")
-        protected ValueWrapper genericToWrapper(Object value,
+        protected static ValueWrapper genericToWrapper(Object value,
                 @CachedLibrary("value") InteropLibrary values,
                 @Cached @Shared NativeToWrapperNode nativeToWrapperNode,
-                @Cached BranchProfile unsupportedProfile) {
+                @Cached InlinedBranchProfile unsupportedProfile,
+                @Bind("this") Node node) {
             long handle;
             try {
                 handle = values.asPointer(value);
             } catch (UnsupportedMessageException e) {
-                unsupportedProfile.enter();
-                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 nativeToWrapperNode.execute(handle);
         }
@@ -256,16 +258,17 @@ protected Object longToWrapper(long value,
     }
 
     @Specialization(guards = { "!isWrapper(value)", "values.isPointer(value)" }, limit = "getCacheLimit()")
-    protected Object unwrapGeneric(Object value,
+    protected static Object unwrapGeneric(Object value,
             @CachedLibrary("value") InteropLibrary values,
             @Cached @Exclusive UnwrapNativeNode unwrapNativeNode,
-            @Cached BranchProfile unsupportedProfile) {
+            @Cached InlinedBranchProfile unsupportedProfile,
+            @Bind("this") Node node) {
         long handle;
         try {
             handle = values.asPointer(value);
         } catch (UnsupportedMessageException e) {
-            unsupportedProfile.enter();
-            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/ValueWrapper.java b/src/main/java/org/truffleruby/cext/ValueWrapper.java
@@ -9,6 +9,9 @@
  */
 package org.truffleruby.cext;
 
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.cext.ValueWrapperManager.AllocateHandleNode;
 import org.truffleruby.cext.ValueWrapperManager.HandleBlock;
@@ -25,7 +28,6 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 /** This object represents a VALUE in C which wraps the raw Ruby object. This allows foreign access methods to be set up
  * which convert these value wrappers to native pointers without affecting the semantics of the wrapped objects. */
@@ -102,22 +104,24 @@ protected boolean isPointer() {
     @ExportMessage
     protected static void toNative(ValueWrapper wrapper,
             @Cached AllocateHandleNode createNativeHandleNode,
-            @Cached @Exclusive BranchProfile createHandleProfile) {
+            @Cached @Exclusive InlinedBranchProfile createHandleProfile,
+            @Bind("$node") Node node) {
         if (!wrapper.isPointer()) {
-            createHandleProfile.enter();
+            createHandleProfile.enter(node);
             createNativeHandleNode.execute(wrapper);
         }
     }
 
     @ExportMessage
     protected static long asPointer(ValueWrapper wrapper,
             @Cached KeepAliveNode keepAliveNode,
-            @Cached @Exclusive BranchProfile taggedObjectProfile) {
+            @Cached @Exclusive InlinedBranchProfile taggedObjectProfile,
+            @Bind("$node") Node node) {
         long handle = wrapper.getHandle();
         assert handle != ValueWrapperManager.UNSET_HANDLE;
 
         if (ValueWrapperManager.isTaggedObject(handle)) {
-            taggedObjectProfile.enter();
+            taggedObjectProfile.enter(node);
 
             keepAliveNode.execute(wrapper);
         }
@@ -142,11 +146,12 @@ protected boolean isMemberReadable(String member) {
 
     @ExportMessage
     protected static Object readMember(ValueWrapper wrapper, String member,
-            @Cached @Exclusive BranchProfile errorProfile) throws UnknownIdentifierException {
+            @Cached @Exclusive InlinedBranchProfile errorProfile,
+            @Bind("$node") Node node) throws UnknownIdentifierException {
         if ("value".equals(member)) {
             return wrapper.object;
         } else {
-            errorProfile.enter();
+            errorProfile.enter(node);
             throw UnknownIdentifierException.create(member);
         }
     }
diff --git a/src/main/java/org/truffleruby/cext/WrapNode.java b/src/main/java/org/truffleruby/cext/WrapNode.java
@@ -12,7 +12,10 @@
 import static org.truffleruby.cext.ValueWrapperManager.LONG_TAG;
 import static org.truffleruby.cext.ValueWrapperManager.UNSET_HANDLE;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.NeverDefault;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedBranchProfile;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.Layouts;
 import org.truffleruby.core.encoding.Encodings;
@@ -30,7 +33,6 @@
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
-import com.oracle.truffle.api.profiles.BranchProfile;
 
 import java.lang.invoke.VarHandle;
 
@@ -46,9 +48,9 @@ public static WrapNode create() {
 
     @Specialization
     protected ValueWrapper wrapLong(long value,
-            @Cached @Exclusive BranchProfile smallFixnumProfile) {
+            @Cached @Exclusive InlinedBranchProfile smallFixnumProfile) {
         if (value >= ValueWrapperManager.MIN_FIXNUM_VALUE && value <= ValueWrapperManager.MAX_FIXNUM_VALUE) {
-            smallFixnumProfile.enter();
+            smallFixnumProfile.enter(this);
             long val = (value << 1) | LONG_TAG;
             return new ValueWrapper(null, val, null);
         } else {
@@ -87,10 +89,10 @@ protected ValueWrapper wrapNil(Nil value) {
 
     @Specialization(guards = "!isNil(value)")
     protected ValueWrapper wrapImmutable(ImmutableRubyObject value,
-            @Cached @Shared BranchProfile noHandleProfile) {
+            @Cached @Shared InlinedBranchProfile noHandleProfile) {
         ValueWrapper wrapper = value.getValueWrapper();
         if (wrapper == null) {
-            noHandleProfile.enter();
+            noHandleProfile.enter(this);
             synchronized (value) {
                 wrapper = value.getValueWrapper();
                 if (wrapper == null) {
@@ -106,12 +108,13 @@ protected ValueWrapper wrapImmutable(ImmutableRubyObject value,
     }
 
     @Specialization(limit = "getDynamicObjectCacheLimit()")
-    protected ValueWrapper wrapValue(RubyDynamicObject value,
+    protected static ValueWrapper wrapValue(RubyDynamicObject value,
             @CachedLibrary("value") DynamicObjectLibrary objectLibrary,
-            @Cached @Shared BranchProfile noHandleProfile) {
+            @Cached @Shared InlinedBranchProfile noHandleProfile,
+            @Bind("this") Node node) {
         ValueWrapper wrapper = (ValueWrapper) objectLibrary.getOrDefault(value, Layouts.VALUE_WRAPPER_IDENTIFIER, null);
         if (wrapper == null) {
-            noHandleProfile.enter();
+            noHandleProfile.enter(node);
             synchronized (value) {
                 wrapper = (ValueWrapper) objectLibrary.getOrDefault(value, Layouts.VALUE_WRAPPER_IDENTIFIER, null);
                 if (wrapper == null) {
diff --git a/src/main/java/org/truffleruby/cext/package-info.java b/src/main/java/org/truffleruby/cext/package-info.java
diff --git a/src/main/java/org/truffleruby/core/MarkingServiceNodes.java b/src/main/java/org/truffleruby/core/MarkingServiceNodes.java
@@ -119,6 +119,7 @@ protected void marksToRun(ExtensionCallStack stack,
         }
 
 
+        @NeverDefault
         public static RunMarkOnExitNode create() {
             return MarkingServiceNodesFactory.RunMarkOnExitNodeGen.create();
         }
diff --git a/src/main/java/org/truffleruby/language/RubyBaseNode.java b/src/main/java/org/truffleruby/language/RubyBaseNode.java
@@ -191,6 +191,10 @@ protected final RubyArray createArray(int[] store) {
         return ArrayHelpers.createArray(getContext(), getLanguage(), store);
     }
 
+    protected static RubyArray createArray(Node node, int[] store) {
+        return ArrayHelpers.createArray(getContext(node), getLanguage(node), store);
+    }
+
     protected final RubyArray createArray(long[] store) {
         return ArrayHelpers.createArray(getContext(), getLanguage(), store);
     }

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,7 @@ protected void marksToRun(ExtensionCallStack stack,`
`119`	`119`	`}`
`120`	`120`
`121`	`121`
	`122`	`+ @NeverDefault`
`122`	`123`	`public static RunMarkOnExitNode create() {`
`123`	`124`	`return MarkingServiceNodesFactory.RunMarkOnExitNodeGen.create();`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,10 @@ protected final RubyArray createArray(int[] store) {`
`191`	`191`	`return ArrayHelpers.createArray(getContext(), getLanguage(), store);`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ protected static RubyArray createArray(Node node, int[] store) {`
	`195`	`+ return ArrayHelpers.createArray(getContext(node), getLanguage(node), store);`
	`196`	`+ }`
	`197`	`+`
`194`	`198`	`protected final RubyArray createArray(long[] store) {`
`195`	`199`	`return ArrayHelpers.createArray(getContext(), getLanguage(), store);`
`196`	`200`	`}`