Refactor CheckFrozenNode so it can be DSL inlinable

Author: horakivo

src/main/java/org/truffleruby/builtins/CoreMethodNodeManager.java

@@ -439,7 +439,7 @@ private static RubyNode transformArgument(CoreMethod method, RubyNode argument,
         }
 
         if (n == 0 && method.raiseIfFrozenSelf()) {
-            argument = TypeNodes.CheckFrozenNode.create(argument);
+            argument = TypeNodes.TypeCheckFrozenNode.create(argument);
         } else if (n == 0 && method.raiseIfNotMutableSelf()) {
             argument = TypeNodes.CheckMutableStringNode.create(argument);
         }

src/main/java/org/truffleruby/builtins/PrimitiveNodeConstructor.java

@@ -52,7 +52,7 @@ public RubyNode createInvokePrimitiveNode(Source source, SourceIndexLength sourc
                 arguments[n] = FixnumLowerNodeGen.create(arguments[n]);
             }
             if (ArrayUtils.contains(annotation.raiseIfFrozen(), n)) {
-                arguments[n] = TypeNodes.CheckFrozenNode.create(arguments[n]);
+                arguments[n] = TypeNodes.TypeCheckFrozenNode.create(arguments[n]);
             }
             if (ArrayUtils.contains(annotation.raiseIfNotMutable(), n)) {
                 arguments[n] = TypeNodes.CheckMutableStringNode.create(arguments[n]);

src/main/java/org/truffleruby/core/support/TypeNodes.java

@@ -13,7 +13,6 @@
 import java.util.List;
 
 import com.oracle.truffle.api.dsl.Bind;
-import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.nodes.Node;
@@ -22,6 +21,7 @@
 import org.truffleruby.annotations.CoreModule;
 import org.truffleruby.annotations.Primitive;
 import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
+import org.truffleruby.builtins.PrimitiveNode;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.core.basicobject.ReferenceEqualNode;
 import org.truffleruby.core.cast.BooleanCastNode;
@@ -41,7 +41,6 @@
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.RubyNode;
-import org.truffleruby.language.RubySourceNode;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.objects.FreezeNode;
@@ -445,45 +444,47 @@ protected Object toRubyInteger(Object value,
         }
     }
 
-    @GenerateUncached
-    @GenerateNodeFactory
     @Primitive(name = "check_frozen")
     @NodeChild(value = "valueNode", type = RubyNode.class)
-    public abstract static class CheckFrozenNode extends RubySourceNode {
+    public abstract static class TypeCheckFrozenNode extends PrimitiveNode {
 
         @NeverDefault
-        public static CheckFrozenNode create() {
-            return create(null);
+        public static TypeCheckFrozenNode create(RubyNode rubyNode) {
+            return TypeNodesFactory.TypeCheckFrozenNodeFactory.create(rubyNode);
         }
 
-        public static CheckFrozenNode create(RubyNode node) {
-            return TypeNodesFactory.CheckFrozenNodeFactory.create(node);
+        @Specialization
+        protected Object check(Object value,
+                @Cached CheckFrozenNode checkFrozenNode) {
+            checkFrozenNode.execute(value);
+
+            return value;
         }
+    }
 
-        public abstract void execute(Object object);
+    @GenerateUncached
+    public abstract static class CheckFrozenNode extends RubyBaseNode {
+
+        @NeverDefault
+        public static CheckFrozenNode create() {
+            return TypeNodesFactory.CheckFrozenNodeGen.create();
+        }
 
-        abstract RubyNode getValueNode();
+        public abstract void execute(Object object);
 
         @Specialization
-        protected Object check(Object value,
+        protected void check(Object value,
                 @Cached IsFrozenNode isFrozenNode,
                 @Cached InlinedBranchProfile errorProfile) {
 
             if (isFrozenNode.execute(value)) {
                 errorProfile.enter(this);
                 throw new RaiseException(getContext(), coreExceptions().frozenError(value, this));
             }
-
-            return value;
-        }
-
-        @Override
-        public RubyNode cloneUninitialized() {
-            return create(getValueNode().cloneUninitialized()).copyFlags(this);
         }
-
     }
 
+
     @Primitive(name = "check_mutable_string")
     public abstract static class CheckMutableStringNode extends PrimitiveArrayArgumentsNode {