ShareInternalFieldsNode supports DSL inlining

Author: horakivo

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

@@ -9,6 +9,9 @@
  */
 package org.truffleruby.language.objects.shared;
 
+import com.oracle.truffle.api.CompilerAsserts;
+import com.oracle.truffle.api.dsl.GenerateCached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.collections.BoundaryIterable;
@@ -31,40 +34,40 @@
 /** Share the plain Java fields which may contain objets for subclasses of RubyDynamicObject.
  * {@link RubyDynamicObject#metaClass} is handled by {@link ShareObjectNode}. */
 @ImportStatic({ ShapeCachingGuards.class, ArrayGuards.class })
+@GenerateCached(false)
+@GenerateInline
 public abstract class ShareInternalFieldsNode extends RubyBaseNode {
 
     protected static final int CACHE_LIMIT = 8;
 
-    protected final int depth;
-
-    public ShareInternalFieldsNode(int depth) {
-        this.depth = depth;
+    public final void execute(Node node, RubyDynamicObject object, int depth) {
+        CompilerAsserts.partialEvaluationConstant(depth);
+        executeInternal(node, object, depth);
     }
 
-    public abstract void executeShare(RubyDynamicObject object);
+    protected abstract void executeInternal(Node node, RubyDynamicObject object, int depth);
 
     @Specialization(limit = "CACHE_LIMIT")
-    protected void shareArray(RubyArray array,
+    protected static void shareArray(RubyArray array, int depth,
             @Bind("array.getStore()") Object store,
             @CachedLibrary("store") ArrayStoreLibrary stores) {
         array.setStore(stores.makeShared(store, array.size));
     }
 
     @Specialization
-    protected void shareCachedQueue(RubyQueue object,
+    protected static void shareCachedQueue(Node node, RubyQueue object, int depth,
             @Cached InlinedConditionProfile profileEmpty,
-            @Cached WriteBarrierNode writeBarrierNode,
-            @Bind("this") Node node) {
+            @Cached WriteBarrierNode writeBarrierNode) {
         final UnsizedQueue queue = object.queue;
-        if (!profileEmpty.profile(this, queue.isEmpty())) {
+        if (!profileEmpty.profile(node, queue.isEmpty())) {
             for (Object e : BoundaryIterable.wrap(queue.getContents())) {
                 writeBarrierNode.execute(node, e, depth);
             }
         }
     }
 
     @Specialization
-    protected void shareCachedBasicObject(RubyBasicObject object) {
+    protected static void shareCachedBasicObject(RubyBasicObject object, int depth) {
         /* No extra Java fields for RubyBasicObject */
     }
 
@@ -73,7 +76,7 @@ protected void shareCachedBasicObject(RubyBasicObject object) {
                     "shareArray",
                     "shareCachedQueue",
                     "shareCachedBasicObject" })
-    protected void shareUncached(RubyDynamicObject object) {
+    protected static void shareUncached(RubyDynamicObject object, int depth) {
         SharedObjects.shareInternalFields(object);
     }
 

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

@@ -54,7 +54,7 @@ protected void shareCached(RubyDynamicObject object,
             @Cached("createSharedShape(cachedShape)") Shape sharedShape,
             @CachedLibrary(limit = "1") DynamicObjectLibrary objectLibrary,
             @Cached("new()") RunTwiceBranchProfile shareMetaClassProfile,
-            @Cached("createShareInternalFieldsNode()") ShareInternalFieldsNode shareInternalFieldsNode,
+            @Cached ShareInternalFieldsNode shareInternalFieldsNode,
             @Cached(value = "getObjectProperties(sharedShape)", dimensions = 1) PropertyGetter[] propertyGetters,
             @Cached("createWriteBarrierNodes(propertyGetters)") WriteBarrierNode[] writeBarrierNodes) {
         // Mark the object as shared first to avoid recursion
@@ -71,7 +71,7 @@ protected void shareCached(RubyDynamicObject object,
         assert SharedObjects
                 .isShared(object.getLogicalClass()) : "the logical class should have been shared by the metaclass";
 
-        shareInternalFieldsNode.executeShare(object);
+        shareInternalFieldsNode.execute(this, object, depth);
 
         for (int i = 0; i < propertyGetters.length; i++) {
             final PropertyGetter propertyGetter = propertyGetters[i];
@@ -110,10 +110,6 @@ protected static PropertyGetter[] getObjectProperties(Shape shape) {
         return objectProperties.toArray(KernelNodes.CopyInstanceVariablesNode.EMPTY_PROPERTY_GETTER_ARRAY);
     }
 
-    protected ShareInternalFieldsNode createShareInternalFieldsNode() {
-        return ShareInternalFieldsNodeGen.create(depth);
-    }
-
     protected WriteBarrierNode[] createWriteBarrierNodes(PropertyGetter[] propertyGetters) {
         WriteBarrierNode[] nodes = propertyGetters.length == 0
                 ? WriteBarrierNode.EMPTY_ARRAY