WriteBarrierNode is DSL inlineable

Author: horakivo

src/main/java/org/truffleruby/core/array/library/NativeArrayStorage.java

@@ -32,7 +32,6 @@
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
-import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -45,6 +44,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 @ExportLibrary(ArrayStoreLibrary.class)
 @GenerateUncached
@@ -162,16 +162,17 @@ static class ShareElements {
 
         @Specialization
         protected static void shareElements(NativeArrayStorage store, int start, int end,
-                @CachedLibrary("store") ArrayStoreLibrary node,
+                @CachedLibrary("store") ArrayStoreLibrary arrayStoreLibrary,
                 @Cached @Exclusive LoopConditionProfile loopProfile,
-                @Cached WriteBarrierNode writeBarrierNode) {
+                @Cached WriteBarrierNode writeBarrierNode,
+                @Bind("$node") Node node) {
             int i = start;
             try {
                 for (; loopProfile.inject(i < end); i++) {
-                    writeBarrierNode.executeWriteBarrier(node.read(store, i));
+                    writeBarrierNode.execute(node, arrayStoreLibrary.read(store, i));
                 }
             } finally {
-                RubyBaseNode.profileAndReportLoopCount(node, loopProfile, i);
+                RubyBaseNode.profileAndReportLoopCount(arrayStoreLibrary, loopProfile, i);
             }
         }
     }

src/main/java/org/truffleruby/core/array/library/ObjectArrayStore.java

@@ -14,8 +14,10 @@
 import java.util.NoSuchElementException;
 
 import com.oracle.truffle.api.TruffleSafepoint;
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.core.array.ArrayGuards;
 import org.truffleruby.core.array.ArrayUtils;
@@ -93,16 +95,17 @@ static class ShareElements {
 
         @Specialization
         protected static void shareElements(Object[] store, int start, int end,
-                @CachedLibrary("store") ArrayStoreLibrary node,
+                @CachedLibrary("store") ArrayStoreLibrary arrayStoreLibrary,
                 @Cached @Exclusive LoopConditionProfile loopProfile,
-                @Cached WriteBarrierNode writeBarrierNode) {
+                @Cached WriteBarrierNode writeBarrierNode,
+                @Bind("$node") Node node) {
             int i = start;
             try {
                 for (; loopProfile.inject(i < end); i++) {
-                    writeBarrierNode.executeWriteBarrier(store[i]);
+                    writeBarrierNode.execute(node, store[i]);
                 }
             } finally {
-                RubyBaseNode.profileAndReportLoopCount(node, loopProfile, i);
+                RubyBaseNode.profileAndReportLoopCount(arrayStoreLibrary, loopProfile, i);
             }
         }
     }

src/main/java/org/truffleruby/core/array/library/SharedArrayStorage.java

@@ -11,17 +11,18 @@
 
 import java.util.Set;
 
+import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
+import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.core.array.ArrayGuards;
 import org.truffleruby.core.array.library.ArrayStoreLibrary.ArrayAllocator;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 import org.truffleruby.language.objects.shared.SharedObjects;
-import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import com.oracle.truffle.api.TruffleSafepoint;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -32,6 +33,7 @@
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
+import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 @ExportLibrary(ArrayStoreLibrary.class)
 @GenerateUncached
@@ -75,16 +77,18 @@ protected Object read(int index,
     @ExportMessage
     protected void write(int index, Object value,
             @Shared @Cached WriteBarrierNode writeBarrierNode,
-            @CachedLibrary("this.storage") ArrayStoreLibrary stores) {
-        writeBarrierNode.executeWriteBarrier(value);
+            @CachedLibrary("this.storage") ArrayStoreLibrary stores,
+            @Bind("$node") Node node) {
+        writeBarrierNode.execute(node, value);
         stores.write(storage, index, value);
     }
 
     @ExportMessage
     protected void fill(int start, int length, Object value,
             @Shared @Cached WriteBarrierNode writeBarrierNode,
-            @CachedLibrary("this.storage") ArrayStoreLibrary stores) {
-        writeBarrierNode.executeWriteBarrier(value);
+            @CachedLibrary("this.storage") ArrayStoreLibrary stores,
+            @Bind("$node") Node node) {
+        writeBarrierNode.execute(node, value);
         stores.fill(storage, start, length, value);
     }
 

src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java

@@ -37,7 +37,6 @@
 import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectIDOperations;
-import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
@@ -47,6 +46,7 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.profiles.BranchProfile;
+import org.truffleruby.language.objects.shared.WriteBarrierNode;
 import org.truffleruby.language.yield.CallBlockNode;
 
 @CoreModule("ObjectSpace")
@@ -215,7 +215,7 @@ protected RubyArray defineFinalizer(VirtualFrame frame, RubyDynamicObject object
                     if (!getContext().getSharedObjects().isSharing()) {
                         startSharing();
                     }
-                    writeBarrierNode.executeWriteBarrier(finalizer);
+                    writeBarrierNode.execute(this, finalizer);
                 }
 
                 defineFinalizer(object, finalizer);
@@ -271,7 +271,7 @@ protected Object defineFinalizer(RubyDynamicObject object, DataHolder dataHolder
                 if (!getContext().getSharedObjects().isSharing()) {
                     startSharing();
                 }
-                writeBarrierNode.executeWriteBarrier(dataHolder);
+                writeBarrierNode.execute(this, dataHolder);
             }
 
             DataObjectFinalizerReference newRef = getContext()

src/main/java/org/truffleruby/language/globals/WriteSimpleGlobalVariableNode.java

@@ -12,16 +12,15 @@
 import com.oracle.truffle.api.dsl.NeverDefault;
 import org.truffleruby.core.basicobject.ReferenceEqualNode;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Shared;
 import com.oracle.truffle.api.dsl.Specialization;
+import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 public abstract class WriteSimpleGlobalVariableNode extends RubyBaseNode {
 
     protected final String name;
-    @Child protected WriteBarrierNode writeBarrierNode = WriteBarrierNode.create();
 
     @NeverDefault
     public static WriteSimpleGlobalVariableNode create(String name) {
@@ -59,10 +58,11 @@ protected Object writeTryToKeepConstant(Object value,
                     "storage.getUnchangedAssumption()",
                     "getLanguage().getGlobalVariableNeverAliasedAssumption(index)" })
     protected Object writeAssumeConstant(Object value,
+            @Cached @Shared WriteBarrierNode writeBarrierNode,
             @Cached(value = "getLanguage().getGlobalVariableIndex(name)", neverDefault = false) @Shared int index,
             @Cached("getContext().getGlobalVariableStorage(index)") GlobalVariableStorage storage) {
         if (getContext().getSharedObjects().isSharing()) {
-            writeBarrierNode.executeWriteBarrier(value);
+            writeBarrierNode.execute(this, value);
         }
         storage.setValueInternal(value);
         storage.updateAssumeConstant(getContext());
@@ -71,9 +71,10 @@ protected Object writeAssumeConstant(Object value,
 
     @Specialization(replaces = "writeAssumeConstant")
     protected Object writeAliasedOrMultiContext(Object value,
+            @Cached @Shared WriteBarrierNode writeBarrierNode,
             @Cached("create(name)") LookupGlobalVariableStorageNode lookupGlobalVariableStorageNode) {
         if (getContext().getSharedObjects().isSharing()) {
-            writeBarrierNode.executeWriteBarrier(value);
+            writeBarrierNode.execute(this, value);
         }
 
         final GlobalVariableStorage storage = lookupGlobalVariableStorageNode.execute(null);

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

@@ -13,14 +13,14 @@
 import com.oracle.truffle.api.nodes.Node;
 import org.truffleruby.language.RubyBaseNode;
 import org.truffleruby.language.RubyDynamicObject;
-import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.object.DynamicObjectLibrary;
+import org.truffleruby.language.objects.shared.WriteBarrierNode;
 
 import java.lang.invoke.VarHandle;
 
@@ -38,12 +38,12 @@ protected static void writeLocal(RubyDynamicObject object, Object name, Object v
     }
 
     @Specialization(guards = "objectLibrary.isShared(object)")
-    protected static void writeShared(RubyDynamicObject object, Object name, Object value,
+    protected static void writeShared(Node node, RubyDynamicObject object, Object name, Object value,
             @CachedLibrary(limit = "getDynamicObjectCacheLimit()") DynamicObjectLibrary objectLibrary,
             @Cached WriteBarrierNode writeBarrierNode) {
 
         // Share `value` before it becomes reachable through `object`
-        writeBarrierNode.executeWriteBarrier(value);
+        writeBarrierNode.execute(node, value);
 
         /* We need a STORE_STORE memory barrier here, to ensure the value is seen as shared by all threads when
          * published below by writing the value to a field of the object. Otherwise, the compiler could theoretically

src/main/java/org/truffleruby/language/objects/classvariables/SetClassVariableNode.java

@@ -50,7 +50,7 @@ protected Object setClassVariableShared(RubyModule module, String name, Object v
             @Cached WriteBarrierNode writeBarrierNode,
             @Cached @Shared InlinedBranchProfile slowPath) {
         // See WriteObjectFieldNode
-        writeBarrierNode.executeWriteBarrier(value);
+        writeBarrierNode.execute(this, value);
 
         final boolean set = classVariableStorage.putIfPresent(name, value, objectLibrary);
         if (!set) {

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

@@ -38,6 +38,6 @@ protected void propagateNotShared(RubyDynamicObject source, Object value,
     protected void propagateShared(RubyDynamicObject source, Object value,
             @Cached @Shared IsSharedNode isSharedNode,
             @Cached WriteBarrierNode writeBarrierNode) {
-        writeBarrierNode.executeWriteBarrier(value);
+        writeBarrierNode.execute(this, value);
     }
 }

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

@@ -9,8 +9,7 @@
  */
 package org.truffleruby.language.objects.shared;
 
-import com.oracle.truffle.api.dsl.Cached.Exclusive;
-import com.oracle.truffle.api.dsl.NeverDefault;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.collections.BoundaryIterable;
 import org.truffleruby.core.array.ArrayGuards;
@@ -54,11 +53,12 @@ protected void shareArray(RubyArray array,
     @Specialization
     protected void shareCachedQueue(RubyQueue object,
             @Cached InlinedConditionProfile profileEmpty,
-            @Cached("createWriteBarrierNode()") @Exclusive WriteBarrierNode writeBarrierNode) {
+            @Cached WriteBarrierNode writeBarrierNode,
+            @Bind("this") Node node) {
         final UnsizedQueue queue = object.queue;
         if (!profileEmpty.profile(this, queue.isEmpty())) {
             for (Object e : BoundaryIterable.wrap(queue.getContents())) {
-                writeBarrierNode.executeWriteBarrier(e);
+                writeBarrierNode.execute(node, e, depth);
             }
         }
     }
@@ -77,9 +77,4 @@ protected void shareUncached(RubyDynamicObject object) {
         SharedObjects.shareInternalFields(object);
     }
 
-    @NeverDefault
-    protected WriteBarrierNode createWriteBarrierNode() {
-        return WriteBarrierNodeGen.create(depth);
-    }
-
 }

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

@@ -76,7 +76,7 @@ protected void shareCached(RubyDynamicObject object,
         for (int i = 0; i < propertyGetters.length; i++) {
             final PropertyGetter propertyGetter = propertyGetters[i];
             final Object value = propertyGetter.get(object);
-            writeBarrierNodes[i].executeWriteBarrier(value);
+            writeBarrierNodes[i].executeCached(value, depth);
         }
 
         assert allFieldsAreShared(object);
@@ -119,7 +119,7 @@ protected WriteBarrierNode[] createWriteBarrierNodes(PropertyGetter[] propertyGe
                 ? WriteBarrierNode.EMPTY_ARRAY
                 : new WriteBarrierNode[propertyGetters.length];
         for (int i = 0; i < nodes.length; i++) {
-            nodes[i] = WriteBarrierNodeGen.create(depth);
+            nodes[i] = WriteBarrierNodeGen.create();
         }
         return nodes;
     }