[GR-45042] Address more sharing warnings [3/3]

PullRequest: truffleruby/3786

Author: horakivo

src/main/java/org/truffleruby/core/array/library/package-info.java

@@ -1,4 +1,4 @@
-@SuppressPackageWarnings({ "truffle-sharing", "truffle-inlining" })
+@SuppressPackageWarnings({ "truffle-inlining" })
 package org.truffleruby.core.array.library;
 
 import com.oracle.truffle.api.dsl.SuppressPackageWarnings;

src/main/java/org/truffleruby/core/cast/NameToJavaStringNode.java

@@ -20,6 +20,7 @@
 import org.truffleruby.utils.Utils;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -48,9 +49,9 @@ public static NameToJavaStringNode getUncached() {
 
     public abstract RubyBaseNodeWithExecute getValueNode();
 
-    @Specialization(guards = "strings.isRubyString(value)", limit = "1")
+    @Specialization(guards = "libString.isRubyString(value)", limit = "1")
     protected String stringNameToJavaString(Object value,
-            @Cached RubyStringLibrary strings,
+            @Cached @Exclusive RubyStringLibrary libString,
             @Cached @Shared ToJavaStringNode toJavaStringNode) {
         return toJavaStringNode.executeToJavaString(value);
     }
@@ -70,8 +71,8 @@ protected String nameToJavaString(String value) {
     protected String nameToJavaString(Object object,
             @Cached BranchProfile errorProfile,
             @Cached DispatchNode toStr,
-            @Cached RubyStringLibrary libString,
-            @Cached @Shared ToJavaStringNode toJavaStringNode) {
+            @Cached @Exclusive RubyStringLibrary libString,
+            @Cached @Exclusive ToJavaStringNode toJavaStringNode) {
         final Object coerced;
         try {
             coerced = toStr.call(object, "to_str");

src/main/java/org/truffleruby/core/cast/ToFNode.java

@@ -11,6 +11,7 @@
 package org.truffleruby.core.cast;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.core.numeric.BigIntegerOps;
 import org.truffleruby.core.numeric.RubyBignum;
@@ -21,6 +22,7 @@ public abstract class ToFNode extends RubyBaseNode {
 
     @Child private DispatchNode toFNode;
 
+    @NeverDefault
     public static ToFNode create() {
         return ToFNodeGen.create();
     }

src/main/java/org/truffleruby/core/cast/ToRubyEncodingNode.java

@@ -10,6 +10,7 @@
 package org.truffleruby.core.cast;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import org.truffleruby.core.encoding.RubyEncoding;
 import org.truffleruby.core.regexp.RubyRegexp;
@@ -34,13 +35,13 @@ public static ToRubyEncodingNode create() {
 
     @Specialization
     protected RubyEncoding stringToEncoding(RubyString value,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Exclusive RubyStringLibrary libString) {
         return libString.getEncoding(value);
     }
 
     @Specialization
     protected RubyEncoding immutableStringToEncoding(ImmutableRubyString value,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Exclusive RubyStringLibrary libString) {
         return libString.getEncoding(value);
     }
 

src/main/java/org/truffleruby/core/cast/ToSymbolNode.java

@@ -10,6 +10,8 @@
 package org.truffleruby.core.cast;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -67,7 +69,7 @@ protected RubySymbol javaStringUncached(String str) {
             guards = { "strings.isRubyString(str)", "equalNode.execute(strings, str, cachedTString, cachedEncoding)" },
             limit = "getCacheLimit()")
     protected RubySymbol rubyString(Object str,
-            @Cached RubyStringLibrary strings,
+            @Cached @Shared RubyStringLibrary strings,
             @Cached(value = "asTruffleStringUncached(str)") TruffleString cachedTString,
             @Cached(value = "strings.getEncoding(str)") RubyEncoding cachedEncoding,
             @Cached StringHelperNodes.EqualSameEncodingNode equalNode,
@@ -77,15 +79,15 @@ protected RubySymbol rubyString(Object str,
 
     @Specialization(guards = "strings.isRubyString(str)", replaces = "rubyString", limit = "1")
     protected RubySymbol rubyStringUncached(Object str,
-            @Cached RubyStringLibrary strings) {
+            @Cached @Shared RubyStringLibrary strings) {
         return getSymbol(strings.getTString(str), strings.getEncoding(str));
     }
 
     @Specialization(guards = { "!isRubySymbol(object)", "!isString(object)", "isNotRubyString(object)" })
     protected RubySymbol toStr(Object object,
             @Cached BranchProfile errorProfile,
             @Cached DispatchNode toStrNode,
-            @Cached RubyStringLibrary libString,
+            @Cached @Exclusive RubyStringLibrary strings,
             @Cached ToSymbolNode toSymbolNode) {
         var coerced = toStrNode.call(
                 coreLibrary().truffleTypeModule,
@@ -94,7 +96,7 @@ protected RubySymbol toStr(Object object,
                 coreLibrary().stringClass,
                 coreSymbols().TO_STR);
 
-        if (libString.isRubyString(coerced)) {
+        if (strings.isRubyString(coerced)) {
             return toSymbolNode.execute(coerced);
         } else {
             errorProfile.enter();

src/main/java/org/truffleruby/core/cast/package-info.java

@@ -1,4 +1,4 @@
-@SuppressPackageWarnings({ "truffle-sharing", "truffle-inlining" })
+@SuppressPackageWarnings({ "truffle-inlining" })
 package org.truffleruby.core.cast;
 
 import com.oracle.truffle.api.dsl.SuppressPackageWarnings;

src/main/java/org/truffleruby/core/format/convert/ToDoubleNode.java

@@ -18,6 +18,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.language.objects.IsANode;
@@ -55,14 +56,14 @@ protected double toDouble(RubyBignum bignum) {
 
     @Specialization(guards = { "!isRubyNumber(object)", "isNumeric(object, isANode)" }, limit = "1")
     protected double toDouble(RubyDynamicObject object,
-            @Cached IsANode isANode,
+            @Cached @Shared IsANode isANode,
             @Cached ToFNode toFNode) {
         return toFNode.executeToDouble(object);
     }
 
     @Specialization(guards = { "!isRubyNumber(object)", "!isNumeric(object, isANode)" }, limit = "1")
     protected double toDouble(Object object,
-            @Cached IsANode isANode) {
+            @Cached @Shared IsANode isANode) {
         throw new RaiseException(
                 getContext(),
                 coreExceptions().typeErrorCantConvertInto(object, "Float", this));

src/main/java/org/truffleruby/core/format/convert/ToStringNode.java

@@ -12,6 +12,8 @@
 import java.nio.charset.StandardCharsets;
 
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.strings.TruffleString;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.encoding.Encodings;
@@ -91,7 +93,7 @@ protected RubyString toString(double value,
     @TruffleBoundary
     @Specialization(guards = "specialClassBehaviour")
     protected Object toStringSpecialClass(RubyClass rubyClass,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Shared RubyStringLibrary libString) {
         if (rubyClass == getContext().getCoreLibrary().trueClass) {
             return createString(TStringConstants.TRUE, Encodings.US_ASCII);
         } else if (rubyClass == getContext().getCoreLibrary().falseClass) {
@@ -103,14 +105,14 @@ protected Object toStringSpecialClass(RubyClass rubyClass,
         }
     }
 
-    @Specialization(guards = "libString.isRubyString(string)", limit = "1")
+    @Specialization(guards = "argLibString.isRubyString(string)", limit = "1")
     protected Object toStringString(Object string,
-            @Cached RubyStringLibrary libValue,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Shared RubyStringLibrary libString,
+            @Cached @Exclusive RubyStringLibrary argLibString) {
         if ("inspect".equals(conversionMethod)) {
             final Object value = getToStrNode().call(string, conversionMethod);
 
-            if (libValue.isRubyString(value)) {
+            if (libString.isRubyString(value)) {
                 return value;
             } else {
                 throw new NoImplicitConversionException(string, "String");
@@ -121,7 +123,7 @@ protected Object toStringString(Object string,
 
     @Specialization
     protected Object toString(RubyArray array,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Shared RubyStringLibrary libString) {
         if (toSNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
             toSNode = insert(DispatchNode.create(PRIVATE_RETURN_MISSING));
@@ -139,7 +141,7 @@ protected Object toString(RubyArray array,
     @Specialization(
             guards = { "isNotRubyString(object)", "!isRubyArray(object)", "!isForeignObject(object)" })
     protected Object toString(Object object,
-            @Cached RubyStringLibrary libString) {
+            @Cached @Shared RubyStringLibrary libString) {
         final Object value = getToStrNode().call(object, conversionMethod);
 
         if (libString.isRubyString(value)) {

src/main/java/org/truffleruby/core/format/convert/package-info.java

@@ -1,4 +1,4 @@
-@SuppressPackageWarnings({ "truffle-sharing", "truffle-inlining" })
+@SuppressPackageWarnings({ "truffle-inlining" })
 package org.truffleruby.core.format.convert;
 
 import com.oracle.truffle.api.dsl.SuppressPackageWarnings;

src/main/java/org/truffleruby/core/format/format/package-info.java

@@ -1,4 +1,4 @@
-@SuppressPackageWarnings({ "truffle-sharing", "truffle-inlining" })
+@SuppressPackageWarnings({ "truffle-inlining" })
 package org.truffleruby.core.format.format;
 
 import com.oracle.truffle.api.dsl.SuppressPackageWarnings;