Replace PInteropSetAttributeNode and PInteropDeleteAttributeNode with PyObjectSetAttr

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -110,6 +110,7 @@
 import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyObjectGetIter;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
+import com.oracle.graal.python.lib.PyObjectSetAttr;
 import com.oracle.graal.python.lib.PySequenceCheckNode;
 import com.oracle.graal.python.lib.PySequenceDelItemNode;
 import com.oracle.graal.python.lib.PySequenceGetItemNode;
@@ -231,13 +232,13 @@ public final void clearNativeWrapper() {
     public void writeMember(String key, Object value,
                     @Bind("$node") Node inliningTarget,
                     @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
-                    @Cached PInteropSetAttributeNode setAttributeNode,
+                    @Cached PyObjectSetAttr setAttributeNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached IsBuiltinObjectProfile attrErrorProfile,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            setAttributeNode.execute(this, fromJavaStringNode.execute(key, TS_ENCODING), value);
+            setAttributeNode.execute(null, inliningTarget, this, fromJavaStringNode.execute(key, TS_ENCODING), value);
         } catch (PException e) {
             e.expectAttributeError(inliningTarget, attrErrorProfile);
             // TODO(fa) not accurate; distinguish between read-only and non-existing
@@ -748,13 +749,14 @@ public Object getMembers(boolean includeInternal,
     @ExportMessage
     public void removeMember(String member,
                     @Bind("$node") Node inliningTarget,
-                    @Cached PInteropDeleteAttributeNode deleteAttributeNode,
+                    @Cached PyObjectSetAttr deleteAttributeNode,
+                    @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached IsBuiltinObjectProfile attrErrorProfile,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, UnknownIdentifierException {
         boolean mustRelease = gil.acquire();
         try {
-            deleteAttributeNode.execute(this, member);
+            deleteAttributeNode.delete(null, inliningTarget, this, fromJavaStringNode.execute(member, TS_ENCODING));
         } catch (PException e) {
             e.expectAttributeError(inliningTarget, attrErrorProfile);
             // TODO(fa) not accurate; distinguish between read-only and non-existing

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectSetAttr.java

@@ -96,6 +96,10 @@ public final void deleteCached(Frame frame, Object receiver, TruffleString name)
         execute(frame, null, receiver, name, null);
     }
 
+    public final void delete(Frame frame, Node inliningTarget, Object receiver, TruffleString name) {
+        execute(frame, inliningTarget, receiver, name, null);
+    }
+
     @Specialization(guards = {"name == cachedName", "value != null"}, limit = "1")
     static void setFixedAttr(Frame frame, Node inliningTarget, Object self, @SuppressWarnings("unused") TruffleString name, Object value,
                     @SuppressWarnings("unused") @Cached("name") TruffleString cachedName,