Using limit=1 instead of getIdentityCacheLimit and getIdentityCacheContextLimit

Author: horakivo

src/main/java/org/truffleruby/cext/UnwrapNode.java

@@ -186,7 +186,7 @@ public abstract static class UnwrapCArrayNode extends RubyBaseNode {
         @ExplodeLoop
         @Specialization(
                 guards = { "size == cachedSize", "cachedSize <= MAX_EXPLODE_SIZE" },
-                limit = "getIdentityCacheLimit()")
+                limit = "1")
         protected Object[] unwrapCArrayExplode(Object cArray,
                 @CachedLibrary("cArray") InteropLibrary interop,
                 @Bind("getArraySize(cArray, interop)") int size,

src/main/java/org/truffleruby/core/symbol/RubySymbol.java

@@ -134,7 +134,7 @@ public boolean isString() {
 
     @ExportMessage
     public static class AsString {
-        @Specialization(guards = "symbol == cachedSymbol", limit = "getIdentityCacheLimit()")
+        @Specialization(guards = "symbol == cachedSymbol", limit = "1")
         protected static String asStringCached(RubySymbol symbol,
                 @Cached("symbol") RubySymbol cachedSymbol,
                 @Cached("cachedSymbol.getString()") String cachedString) {
@@ -145,10 +145,6 @@ protected static String asStringCached(RubySymbol symbol,
         protected static String asStringUncached(RubySymbol symbol) {
             return symbol.getString();
         }
-
-        protected static int getIdentityCacheLimit() {
-            return RubyLanguage.getCurrentLanguage().options.IDENTITY_CACHE;
-        }
     }
     // endregion
     // endregion

src/main/java/org/truffleruby/core/symbol/SymbolNodes.java

@@ -87,7 +87,7 @@ public abstract static class HashSymbolNode extends RubyBaseNode {
         // Cannot cache a Symbol's hash while pre-initializing, as it will change in SymbolTable#rehash()
         @Specialization(
                 guards = { "isSingleContext()", "symbol == cachedSymbol", "!preInitializing" },
-                limit = "getIdentityCacheContextLimit()")
+                limit = "1")
         protected long hashCached(RubySymbol symbol,
                 @Cached(value = "isPreInitializing(getContext())") boolean preInitializing,
                 @Cached(value = "symbol") RubySymbol cachedSymbol,
@@ -137,7 +137,7 @@ public static ToProcNode create() {
                         "isSingleContext()",
                         "symbol == cachedSymbol",
                         "getRefinements(callerFrame) == cachedRefinements" },
-                limit = "getIdentityCacheLimit()")
+                limit = "1")
         protected RubyProc toProcCached(Frame callerFrame, RubySymbol symbol, Object[] rubyArgs, RootCallTarget target,
                 @Cached("symbol") RubySymbol cachedSymbol,
                 @Cached("getRefinements(callerFrame)") Map<RubyModule, RubyModule[]> cachedRefinements,
@@ -150,7 +150,7 @@ protected RubyProc toProcCached(Frame callerFrame, RubySymbol symbol, Object[] r
                 guards = {
                         "symbol == cachedSymbol",
                         "getRefinements(callerFrame) == NO_REFINEMENTS" },
-                limit = "getIdentityCacheLimit()")
+                limit = "1")
         protected RubyProc toProcCachedNoRefinements(
                 Frame callerFrame, RubySymbol symbol, Object[] rubyArgs, RootCallTarget target,
                 @Cached("symbol") RubySymbol cachedSymbol,

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

@@ -244,14 +244,6 @@ protected final CoreExceptions coreExceptions() {
         return getContext().getCoreExceptions();
     }
 
-    protected int getIdentityCacheContextLimit() {
-        return getLanguage().options.CONTEXT_SPECIFIC_IDENTITY_CACHE;
-    }
-
-    protected final int getIdentityCacheLimit() {
-        return getLanguage().options.IDENTITY_CACHE;
-    }
-
     protected final int getDefaultCacheLimit() {
         return getLanguage().options.DEFAULT_CACHE;
     }

src/main/java/org/truffleruby/language/objects/SingletonClassNode.java

@@ -43,8 +43,8 @@ public static SingletonClassNode create() {
 
     @Specialization(
             // no need to guard on the context, the rubyClass is context-specific
-            guards = { "rubyClass == cachedClass", "cachedSingletonClass != null" },
-            limit = "getIdentityCacheContextLimit()")
+            guards = { "isSingleContext()", "rubyClass == cachedClass", "cachedSingletonClass != null" },
+            limit = "1")
     protected RubyClass singletonClassClassCached(RubyClass rubyClass,
             @Cached("rubyClass") RubyClass cachedClass,
             @Cached("getSingletonClassOfClassOrNull(getContext(), cachedClass)") RubyClass cachedSingletonClass) {
@@ -58,8 +58,8 @@ protected RubyClass singletonClassClassUncached(RubyClass rubyClass) {
 
     @Specialization(
             // no need to guard on the context, the RubyDynamicObject is context-specific
-            guards = { "object == cachedObject", "!isRubyClass(cachedObject)" },
-            limit = "getIdentityCacheContextLimit()")
+            guards = { "isSingleContext()", "object == cachedObject", "!isRubyClass(cachedObject)" },
+            limit = "1")
     protected RubyClass singletonClassInstanceCached(RubyDynamicObject object,
             @Cached("object") RubyDynamicObject cachedObject,
             @Cached("getSingletonClassForInstance(getContext(), object)") RubyClass cachedSingletonClass) {

src/main/java/org/truffleruby/language/objects/shared/WriteBarrierNode.java

@@ -65,8 +65,7 @@ protected void alreadySharedUncached(RubyDynamicObject value) {
             guards = { "getDepth() < MAX_DEPTH", "value.getShape() == cachedShape", "!cachedShape.isShared()" },
             assumptions = "cachedShape.getValidAssumption()",
             // limit of 1 to avoid creating many nodes if the value's Shape is polymorphic.
-            // GR-36904: Not simply using "1" so the cached nodes are cleared when writeBarrierUncached() is activated.
-            limit = "getIdentityCacheLimit()")
+            limit = "1")
     protected void writeBarrierCached(RubyDynamicObject value,
             @Cached("value.getShape()") Shape cachedShape,
             @Cached("createShareObjectNode()") ShareObjectNode shareObjectNode) {