Refactor AllocateNode node to support DSL inlining

Author: horakivo

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

@@ -82,9 +82,9 @@
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.range.RangeNodes;
 import org.truffleruby.core.range.RubyIntOrLongRange;
+import org.truffleruby.core.string.AllocateNode;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringHelperNodes;
-import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.core.support.TypeNodes;
 import org.truffleruby.core.support.TypeNodes.CheckFrozenNode;
 import org.truffleruby.core.support.TypeNodes.ObjectInstanceVariablesNode;
@@ -539,7 +539,7 @@ protected RubyDynamicObject copyRubyClass(RubyClass self,
 
         @Specialization
         protected RubyDynamicObject copy(ImmutableRubyString string,
-                @Cached StringNodes.AllocateNode allocateStringNode) {
+                @Cached AllocateNode allocateStringNode) {
             return allocateStringNode.execute(coreLibrary().stringClass);
         }
 

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 2.0, or
+ * GNU General Public License version 2, or
+ * GNU Lesser General Public License version 2.1.
+ */
+package org.truffleruby.core.string;
+
+import com.oracle.truffle.api.dsl.GenerateUncached;
+import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.core.encoding.Encodings;
+import org.truffleruby.core.klass.RubyClass;
+import org.truffleruby.language.RubyBaseNode;
+import org.truffleruby.language.objects.AllocationTracing;
+
+import static org.truffleruby.core.string.TStringConstants.EMPTY_BINARY;
+
+@GenerateUncached
+public abstract class AllocateNode extends RubyBaseNode {
+
+    public abstract RubyString execute(RubyClass rubyClass);
+
+    @Specialization
+    protected RubyString allocate(RubyClass rubyClass) {
+        final RubyString string = new RubyString(
+                rubyClass,
+                getLanguage().stringShape,
+                false,
+                EMPTY_BINARY,
+                Encodings.BINARY);
+        AllocationTracing.trace(string, this);
+        return string;
+    }
+}

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

@@ -155,7 +155,6 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 import org.truffleruby.language.library.RubyStringLibrary;
-import org.truffleruby.language.objects.AllocationTracing;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
 import org.truffleruby.language.threadlocal.SpecialVariableStorage;
 import org.truffleruby.language.yield.CallBlockNode;
@@ -167,7 +166,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.CreateCast;
 import com.oracle.truffle.api.dsl.Fallback;
-import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
@@ -182,40 +180,24 @@
 @CoreModule(value = "String", isClass = true)
 public abstract class StringNodes {
 
-    @GenerateUncached
     @GenerateNodeFactory
     @CoreMethod(names = { "__allocate__", "__layout_allocate__" }, constructor = true, visibility = Visibility.PRIVATE)
     @NodeChild(value = "rubyClassNode", type = RubyNode.class)
-    public abstract static class AllocateNode extends RubySourceNode {
-
-        @NeverDefault
-        public static AllocateNode create() {
-            return StringNodesFactory.AllocateNodeFactory.create(null);
-        }
-
-        public static AllocateNode create(RubyNode rubyClassNode) {
-            return StringNodesFactory.AllocateNodeFactory.create(rubyClassNode);
-        }
-
-        public abstract RubyString execute(RubyClass rubyClass);
+    public abstract static class StringAllocateNode extends RubySourceNode {
 
         abstract RubyNode getRubyClassNode();
 
         @Specialization
-        protected RubyString allocate(RubyClass rubyClass) {
-            final RubyString string = new RubyString(
-                    rubyClass,
-                    getLanguage().stringShape,
-                    false,
-                    EMPTY_BINARY,
-                    Encodings.BINARY);
-            AllocationTracing.trace(string, this);
-            return string;
+        protected RubyString allocate(RubyClass rubyClass,
+                @Cached AllocateNode allocateNode) {
+            return allocateNode.execute(rubyClass);
         }
 
+
         @Override
         public RubyNode cloneUninitialized() {
-            return create(getRubyClassNode().cloneUninitialized()).copyFlags(this);
+            return StringNodesFactory.StringAllocateNodeFactory.create(getRubyClassNode().cloneUninitialized())
+                    .copyFlags(this);
         }
 
     }