[GR-24484] Creating a TruffleWeakReference() no longer needs to be behind a boundary.

PullRequest: truffleruby/1772

Author: eregon

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "06123acce40608ee9e7b505e9bb6d37d39904698",
+                "version": "3c99069a68f25e0383440ee2e5a1adc041f93ab4",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

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

@@ -15,7 +15,6 @@
 import org.truffleruby.language.objects.ReadObjectFieldNode;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
 
-import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.HiddenKey;
@@ -34,14 +33,10 @@ public static abstract class WeakRefSetObjectPrimitiveNode extends PrimitiveArra
 
         @Specialization
         protected Object weakRefSetObject(DynamicObject weakRef, Object object) {
-            fieldNode.write(weakRef, fieldName, newTruffleWeakReference(object));
+            fieldNode.write(weakRef, fieldName, new TruffleWeakReference<>(object));
             return object;
         }
 
-        @TruffleBoundary // GR-24484
-        private TruffleWeakReference<Object> newTruffleWeakReference(Object object) {
-            return new TruffleWeakReference<>(object);
-        }
     }
 
     @Primitive(name = "weakref_object")

src/main/java/org/truffleruby/interop/messages/RubyObjectMessages.java

@@ -46,8 +46,8 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.EncapsulatingNodeReference;
 import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -769,7 +769,7 @@ protected static void untaint(DynamicObject object,
 
     private static Node getNode(RubyLibrary node) {
         if (!node.isAdoptable()) {
-            return NodeUtil.getCurrentEncapsulatingNode();
+            return EncapsulatingNodeReference.getCurrent().get();
         }
         return node;
     }