replace RubyLibrary with FreezeNode and IsFrozenNode

Author: horakivo

CHANGELOG.md

@@ -15,6 +15,11 @@ Performance:
 Changes:
 
 
+Memory Footprint:
+
+* Replaced `RubyLibrary` with `FreezeNode` and `IsFrozenNode` (@horakivo).
+
+
 # 23.0.0
 
 New features:

src/main/java/org/truffleruby/Layouts.java

@@ -13,6 +13,8 @@
 
 public abstract class Layouts {
 
+    public static final int FROZEN_FLAG = 1;
+
     // Special variables
 
     public static final String TEMP_PREFIX = "%";

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

@@ -21,7 +21,7 @@
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.library.RubyLibrary;
+import org.truffleruby.language.objects.IsFrozenNode;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 
@@ -126,20 +126,20 @@ public boolean isArrayElementReadable(long index) {
 
     @ExportMessage
     public boolean isArrayElementModifiable(long index,
-            @CachedLibrary("this") RubyLibrary rubyLibrary) {
-        return !rubyLibrary.isFrozen(this) && inBounds(index);
+            @Cached IsFrozenNode isFrozenNode) {
+        return !isFrozenNode.execute(this) && inBounds(index);
     }
 
     @ExportMessage
     public boolean isArrayElementRemovable(long index,
-            @CachedLibrary("this") RubyLibrary rubyLibrary) {
-        return !rubyLibrary.isFrozen(this) && inBounds(index);
+            @Cached IsFrozenNode isFrozenNode) {
+        return !isFrozenNode.execute(this) && inBounds(index);
     }
 
     @ExportMessage
     public boolean isArrayElementInsertable(long index,
-            @CachedLibrary("this") RubyLibrary rubyLibrary) {
-        return !rubyLibrary.isFrozen(this) && RubyGuards.fitsInInteger(index) && index >= size;
+            @Cached IsFrozenNode isFrozenNode) {
+        return !isFrozenNode.execute(this) && RubyGuards.fitsInInteger(index) && index >= size;
     }
     // endregion
 

src/main/java/org/truffleruby/core/format/read/bytes/ReadStringPointerNode.java

@@ -19,7 +19,6 @@
 import org.truffleruby.extra.ffi.Pointer;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.control.RaiseException;
-import org.truffleruby.language.library.RubyLibrary;
 
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -46,7 +45,6 @@ protected MissingValue decode(Nil nil) {
 
     @Specialization
     protected RubyString read(VirtualFrame frame, long address,
-            @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibrary,
             @CachedLibrary(limit = "1") InteropLibrary interop) {
         final Pointer pointer = new Pointer(getContext(), address);
         checkAssociated(

src/main/java/org/truffleruby/core/hash/RubyHash.java

@@ -35,7 +35,7 @@
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.library.RubyLibrary;
+import org.truffleruby.language.objects.IsFrozenNode;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 
@@ -133,15 +133,15 @@ public final boolean isHashEntryExisting(Object key,
     @ExportMessage(name = "isHashEntryRemovable")
     public boolean isHashEntryModifiableAndRemovable(Object key,
             @CachedLibrary("this") InteropLibrary interop,
-            @CachedLibrary("this") RubyLibrary rubyLibrary) {
-        return !rubyLibrary.isFrozen(this) && interop.isHashEntryExisting(this, key);
+            @Cached IsFrozenNode isFrozenNode) {
+        return !isFrozenNode.execute(this) && interop.isHashEntryExisting(this, key);
     }
 
     @ExportMessage
     public boolean isHashEntryInsertable(Object key,
             @CachedLibrary("this") InteropLibrary interop,
-            @CachedLibrary("this") RubyLibrary rubyLibrary) {
-        return !rubyLibrary.isFrozen(this) && !interop.isHashEntryExisting(this, key);
+            @Cached IsFrozenNode isFrozenNode) {
+        return !isFrozenNode.execute(this) && !interop.isHashEntryExisting(this, key);
     }
 
     @ExportMessage(limit = "hashStrategyLimit()")
@@ -168,10 +168,10 @@ public Object readHashValueOrDefault(Object key, Object defaultValue,
     @ExportMessage
     public void writeHashEntry(Object key, Object value,
             @Cached @Exclusive DispatchNode set,
-            @CachedLibrary("this") RubyLibrary rubyLibrary,
+            @Cached IsFrozenNode isFrozenNode,
             @Cached @Shared ForeignToRubyNode toRuby)
             throws UnsupportedMessageException {
-        if (rubyLibrary.isFrozen(this)) {
+        if (isFrozenNode.execute(this)) {
             throw UnsupportedMessageException.create();
         }
         set.call(this, "[]=", toRuby.executeConvert(key), value);
@@ -180,11 +180,11 @@ public void writeHashEntry(Object key, Object value,
     @ExportMessage
     public void removeHashEntry(Object key,
             @Cached @Exclusive DispatchNode delete,
-            @CachedLibrary("this") RubyLibrary rubyLibrary,
+            @Cached IsFrozenNode isFrozenNode,
             @CachedLibrary("this") InteropLibrary interop,
             @Cached @Shared ForeignToRubyNode toRuby)
             throws UnsupportedMessageException, UnknownKeyException {
-        if (rubyLibrary.isFrozen(this)) {
+        if (isFrozenNode.execute(this)) {
             throw UnsupportedMessageException.create();
         }
         if (!interop.isHashEntryExisting(this, key)) {

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -118,7 +118,6 @@
 import org.truffleruby.language.dispatch.RubyCallNode;
 import org.truffleruby.language.loader.EvalLoader;
 import org.truffleruby.language.globals.ReadGlobalVariableNodeGen;
-import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.loader.RequireNode;
 import org.truffleruby.language.loader.RequireNodeGen;
@@ -128,9 +127,11 @@
 import org.truffleruby.annotations.Split;
 import org.truffleruby.language.objects.AllocationTracing;
 import org.truffleruby.language.objects.CheckIVarNameNode;
+import org.truffleruby.language.objects.FreezeNode;
 import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.IsCopyableObjectNode;
 import org.truffleruby.language.objects.IsCopyableObjectNodeGen;
+import org.truffleruby.language.objects.IsFrozenNode;
 import org.truffleruby.language.objects.LogicalClassNode;
 import org.truffleruby.language.objects.MetaClassNode;
 import org.truffleruby.language.objects.ShapeCachingGuards;
@@ -553,15 +554,15 @@ public abstract static class CloneNode extends PrimitiveArrayArgumentsNode {
         @Child SingletonClassNode singletonClassNode;
         private final BranchProfile cantUnfreezeErrorProfile = BranchProfile.create();
 
-        @Specialization(guards = "isCopyableObjectNode.execute(object)", limit = "getRubyLibraryCacheLimit()")
+        @Specialization(guards = "isCopyableObjectNode.execute(object)")
         protected RubyDynamicObject copyable(Object object, Object freeze,
                 @Cached MetaClassNode metaClassNode,
                 @Cached CopyNode copyNode,
                 @Cached DispatchNode initializeCloneNode,
                 @Cached ConditionProfile isSingletonProfile,
                 @Cached HashingNodes.ToHashByHashCode hashNode,
-                @CachedLibrary("object") RubyLibrary rubyLibrary,
-                @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibraryFreeze) {
+                @Cached IsFrozenNode isFrozenNode,
+                @Cached FreezeNode freezeNode) {
             final RubyDynamicObject newObject = copyNode.executeCopy(object);
 
             // Copy the singleton class if any.
@@ -582,8 +583,8 @@ protected RubyDynamicObject copyable(Object object, Object freeze,
             }
 
             // Default behavior - is just to copy the frozen state of the original object
-            if (forceFrozen(freeze) || (copyFrozen && rubyLibrary.isFrozen(object))) { // Profiled through lazy usage of rubyLibraryFreeze
-                rubyLibraryFreeze.freeze(newObject);
+            if (forceFrozen(freeze) || (copyFrozen && isFrozenNode.execute(object))) { // Profiled through lazy usage of rubyLibraryFreeze
+                freezeNode.execute(newObject);
             }
 
             return newObject;
@@ -839,10 +840,10 @@ protected Object freeze(Object self,
     @GenerateUncached
     @CoreMethod(names = "frozen?", alwaysInlined = true)
     public abstract static class KernelFrozenNode extends AlwaysInlinedMethodNode {
-        @Specialization(limit = "getRubyLibraryCacheLimit()")
+        @Specialization
         protected boolean isFrozen(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget target,
-                @CachedLibrary("self") RubyLibrary rubyLibrary) {
-            return rubyLibrary.isFrozen(self);
+                @Cached IsFrozenNode isFrozenNode) {
+            return isFrozenNode.execute(self);
         }
     }
 

src/main/java/org/truffleruby/core/module/ModuleFields.java

@@ -48,6 +48,7 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.loader.ReentrantLockFreeingMap;
 import org.truffleruby.language.methods.InternalMethod;
+import org.truffleruby.language.objects.IsFrozenNodeGen;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 import org.truffleruby.language.objects.classvariables.ClassVariableStorage;
@@ -241,7 +242,7 @@ public void initCopy(RubyModule from) {
     }
 
     public void checkFrozen(RubyContext context, Node currentNode) {
-        if (context.getCoreLibrary() != null && rubyModule.isFrozenUncached()) {
+        if (context.getCoreLibrary() != null && IsFrozenNodeGen.getUncached().execute(rubyModule)) {
             String name;
             Object receiver = rubyModule;
             if (rubyModule instanceof RubyClass) {

src/main/java/org/truffleruby/core/module/ModuleNodes.java

@@ -102,7 +102,6 @@
 import org.truffleruby.language.control.ReturnID;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.loader.EvalLoader;
-import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.loader.CodeLoader;
 import org.truffleruby.language.methods.Arity;
@@ -114,6 +113,7 @@
 import org.truffleruby.language.methods.UsingNode;
 import org.truffleruby.language.objects.AllocationTracing;
 import org.truffleruby.language.objects.IsANode;
+import org.truffleruby.language.objects.IsFrozenNode;
 import org.truffleruby.language.objects.SingletonClassNode;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
 import org.truffleruby.language.objects.classvariables.CheckClassVariableNameNode;
@@ -447,9 +447,9 @@ protected Object notObject(Frame callerFrame, Object self, Object[] rubyArgs, Ro
     @GenerateUncached
     public abstract static class GeneratedWriterNode extends AlwaysInlinedMethodNode {
 
-        @Specialization(guards = "!rubyLibrary.isFrozen(self)")
+        @Specialization(guards = "!isFrozenNode.execute(self)", limit = "1")
         protected Object writer(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget target,
-                @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibrary,
+                @Cached IsFrozenNode isFrozenNode,
                 @Cached WriteObjectFieldNode writeObjectFieldNode) {
             final String ivarName = RubyRootNode.of(target).getSharedMethodInfo().getNotes();
             CompilerAsserts.partialEvaluationConstant(ivarName);
@@ -459,9 +459,9 @@ protected Object writer(Frame callerFrame, Object self, Object[] rubyArgs, RootC
             return value;
         }
 
-        @Specialization(guards = "rubyLibrary.isFrozen(self)")
+        @Specialization(guards = "isFrozenNode.execute(self)", limit = "1")
         protected Object frozen(Frame callerFrame, Object self, Object[] rubyArgs, RootCallTarget target,
-                @CachedLibrary(limit = "getRubyLibraryCacheLimit()") RubyLibrary rubyLibrary) {
+                @Cached IsFrozenNode isFrozenNode) {
             throw new RaiseException(getContext(), coreExceptions().frozenError(self, this));
         }
     }

src/main/java/org/truffleruby/core/range/RubyObjectRange.java

@@ -11,17 +11,13 @@
 
 import java.util.Set;
 
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.Shape;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
-import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 
-@ExportLibrary(RubyLibrary.class)
 public final class RubyObjectRange extends RubyDynamicObject implements ObjectGraphNode {
 
     public boolean excludedEnd;
@@ -43,16 +39,6 @@ public RubyObjectRange(
         this.frozen = frozen;
     }
 
-    @ExportMessage
-    protected void freeze() {
-        frozen = true;
-    }
-
-    @ExportMessage
-    protected boolean isFrozen() {
-        return frozen;
-    }
-
     public boolean isBoundless() {
         return begin == Nil.INSTANCE && end == Nil.INSTANCE;
     }

src/main/java/org/truffleruby/core/string/RubyString.java

@@ -27,7 +27,6 @@
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;
-import org.truffleruby.language.library.RubyLibrary;
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.library.ExportMessage;
@@ -36,7 +35,6 @@
 
 import java.util.Objects;
 
-@ExportLibrary(RubyLibrary.class)
 @ExportLibrary(InteropLibrary.class)
 @ImportStatic(RubyBaseNode.class)
 public final class RubyString extends RubyDynamicObject {
@@ -105,17 +103,13 @@ public RubyEncoding getEncodingUnprofiled() {
         return encoding;
     }
 
-    // region RubyLibrary messages
-    @ExportMessage
     public void freeze() {
         frozen = true;
     }
 
-    @ExportMessage
     public boolean isFrozen() {
         return frozen;
     }
-    // endregion
 
     // region String messages
     @ExportMessage