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

PullRequest: truffleruby/3779

Author: horakivo

src/main/java/org/truffleruby/core/array/ArrayNodes.java

@@ -672,7 +672,7 @@ protected Object delete(RubyArray array, Object value, Object maybeBlock,
                 @Bind("array.getStore()") Object store,
                 @CachedLibrary("store") ArrayStoreLibrary stores,
                 @Cached @Shared IntValueProfile arraySizeProfile,
-                @Cached @Exclusive LoopConditionProfile loopProfile) {
+                @Cached @Shared LoopConditionProfile loopProfile) {
 
             return delete(array, value, maybeBlock, true, store, store, stores, stores, arraySizeProfile, loopProfile);
         }
@@ -685,7 +685,7 @@ protected Object delete(RubyArray array, Object value, Object maybeBlock,
                 @CachedLibrary("store") ArrayStoreLibrary stores,
                 @CachedLibrary(limit = "1") ArrayStoreLibrary newStores,
                 @Cached @Shared IntValueProfile arraySizeProfile,
-                @Cached @Exclusive LoopConditionProfile loopProfile) {
+                @Cached @Shared LoopConditionProfile loopProfile) {
 
             final Object newStore = stores.allocator(store).allocate(arraySizeProfile.profile(array.size));
             return delete(array, value, maybeBlock, false, store, newStore, stores, newStores, arraySizeProfile,

src/main/java/org/truffleruby/core/basicobject/BasicObjectNodes.java

@@ -77,6 +77,7 @@
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NodeChild;
@@ -355,11 +356,11 @@ public abstract static class InstanceEvalNode extends AlwaysInlinedMethodNode {
         @Specialization(guards = "isBlockProvided(rubyArgs)")
         protected Object evalWithBlock(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget target,
                 @Cached InstanceExecBlockNode instanceExecNode,
-                @Cached BranchProfile errorProfile) {
+                @Cached @Exclusive BranchProfile wrongNumberOfArgumentsProfile) {
             final int count = RubyArguments.getPositionalArgumentsCount(rubyArgs, false);
 
             if (count > 0) {
-                errorProfile.enter();
+                wrongNumberOfArgumentsProfile.enter();
                 throw new RaiseException(getContext(), coreExceptions().argumentError(count, 0, this));
             }
 
@@ -370,7 +371,7 @@ protected Object evalWithBlock(Frame callerFrame, Object self, Object[] rubyArgs
 
         @Specialization(guards = "!isBlockProvided(rubyArgs)")
         protected Object evalWithString(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget target,
-                @Cached BranchProfile errorProfile,
+                @Cached @Exclusive BranchProfile zeroNumberOfArguments,
                 @Cached RubyStringLibrary strings,
                 @Cached ToJavaStringNode toJavaStringNode,
                 @Cached ToStrNode toStrNode,
@@ -382,7 +383,7 @@ protected Object evalWithString(Frame callerFrame, Object self, Object[] rubyArg
             int count = RubyArguments.getPositionalArgumentsCount(rubyArgs, false);
 
             if (count == 0) {
-                errorProfile.enter();
+                zeroNumberOfArguments.enter();
                 throw new RaiseException(getContext(), coreExceptions().argumentError(0, 1, 2, this));
             }
 

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

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

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

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

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

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

src/main/java/org/truffleruby/core/encoding/EncodingConverterNodes.java

@@ -51,6 +51,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.CreateCast;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -280,7 +281,7 @@ public abstract static class EncodingConverterPutbackNode extends CoreMethodArra
 
         @Specialization
         protected RubyString encodingConverterPutback(RubyEncodingConverter encodingConverter, int maxBytes,
-                @Cached DispatchNode sourceEncodingNode) {
+                @Cached @Shared DispatchNode sourceEncodingNode) {
             // Taken from org.jruby.RubyConverter#putback.
 
             final EConv ec = encodingConverter.econv;
@@ -291,7 +292,7 @@ protected RubyString encodingConverterPutback(RubyEncodingConverter encodingConv
 
         @Specialization
         protected RubyString encodingConverterPutback(RubyEncodingConverter encodingConverter, NotProvided maxBytes,
-                @Cached DispatchNode sourceEncodingNode) {
+                @Cached @Shared DispatchNode sourceEncodingNode) {
             // Taken from org.jruby.RubyConverter#putback.
 
             final EConv ec = encodingConverter.econv;

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

@@ -45,6 +45,7 @@
 import com.oracle.truffle.api.CompilerDirectives;
 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.Specialization;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -260,8 +261,8 @@ protected RubyEncoding negotiateSameEncodingUncached(Object first, Object second
 
         @Specialization(guards = { "libFirst.isRubyString(first)", "libSecond.isRubyString(second)" }, limit = "1")
         protected RubyEncoding negotiateStringStringEncoding(Object first, Object second,
-                @Cached RubyStringLibrary libFirst,
-                @Cached RubyStringLibrary libSecond,
+                @Cached @Shared RubyStringLibrary libFirst,
+                @Cached @Shared RubyStringLibrary libSecond,
                 @Cached NegotiateCompatibleStringEncodingNode negotiateNode) {
             final RubyEncoding firstEncoding = libFirst.getEncoding(first);
             final RubyEncoding secondEncoding = libSecond.getEncoding(second);
@@ -282,8 +283,7 @@ protected RubyEncoding negotiateStringStringEncoding(Object first, Object second
                         "firstEncoding != secondEncoding" },
                 limit = "getCacheLimit()")
         protected RubyEncoding negotiateStringObjectCached(Object first, Object second,
-                @Cached RubyStringLibrary libFirst,
-                @Cached RubyStringLibrary libSecond,
+                @Cached @Shared RubyStringLibrary libFirst,
                 @Cached("getEncoding(first)") RubyEncoding firstEncoding,
                 @Cached("getEncoding(second)") RubyEncoding secondEncoding,
                 @Cached("getCodeRange(first, libFirst)") TruffleString.CodeRange codeRange,
@@ -298,7 +298,7 @@ protected RubyEncoding negotiateStringObjectCached(Object first, Object second,
                         "isNotRubyString(second)" },
                 replaces = "negotiateStringObjectCached", limit = "1")
         protected RubyEncoding negotiateStringObjectUncached(Object first, Object second,
-                @Cached RubyStringLibrary libFirst) {
+                @Cached @Shared RubyStringLibrary libFirst) {
             final RubyEncoding firstEncoding = getEncoding(first);
             final RubyEncoding secondEncoding = getEncoding(second);
 
@@ -328,7 +328,7 @@ protected RubyEncoding negotiateStringObjectUncached(Object first, Object second
                         "isNotRubyString(first)" },
                 limit = "1")
         protected RubyEncoding negotiateObjectString(Object first, Object second,
-                @Cached RubyStringLibrary libSecond) {
+                @Cached @Shared RubyStringLibrary libSecond) {
             return negotiateStringObjectUncached(second, first, libSecond);
         }
 

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

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

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

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

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

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