Remove unused PInteropXXX nodes

Author: steve-s

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

@@ -48,11 +48,8 @@
 import static com.oracle.graal.python.nodes.ErrorMessages.S_MUST_BE_A_S_TUPLE;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T_KEYS;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DELETE__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DELITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETATTRIBUTE__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GETATTR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___GET__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___SET__;
 import static com.oracle.graal.python.nodes.StringLiterals.T_LBRACKET;
 import static com.oracle.graal.python.nodes.truffle.TruffleStringMigrationHelpers.isJavaString;
@@ -71,7 +68,6 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
 import com.oracle.graal.python.builtins.objects.buffer.PythonBufferAccessLibrary;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiGuards;
 import com.oracle.graal.python.builtins.objects.cext.capi.PythonNativeWrapper.PythonAbstractObjectNativeWrapper;
@@ -119,7 +115,6 @@
 import com.oracle.graal.python.lib.PySequenceSizeNode;
 import com.oracle.graal.python.lib.PyTupleSizeNode;
 import com.oracle.graal.python.nodes.BuiltinNames;
-import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.HiddenAttr;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
@@ -129,7 +124,6 @@
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
-import com.oracle.graal.python.nodes.call.special.CallTernaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.CallVarargsMethodNode;
 import com.oracle.graal.python.nodes.expression.CastToListExpressionNode.CastToListInteropNode;
 import com.oracle.graal.python.nodes.interop.GetInteropBehaviorNode;
@@ -232,8 +226,8 @@ public final void clearNativeWrapper() {
     @ExportMessage
     public void writeMember(String key, Object value,
                     @Bind("$node") Node inliningTarget,
-                    @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
-                    @Cached PyObjectSetAttr setAttributeNode,
+                    @Exclusive @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Exclusive @Cached PyObjectSetAttr setAttributeNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached IsBuiltinObjectProfile attrErrorProfile,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, UnknownIdentifierException {
@@ -252,7 +246,7 @@ public void writeMember(String key, Object value,
     @ExportMessage
     public Object readMember(String key,
                     @Bind("$node") Node inliningTarget,
-                    @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Exclusive @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached PyObjectLookupAttr lookup,
                     @Exclusive @Cached GilNode gil) throws UnknownIdentifierException {
@@ -604,7 +598,7 @@ public boolean hasMemberWriteSideEffects(String member,
     @ExportMessage
     public Object invokeMember(String member, Object[] arguments,
                     @Bind("$node") Node inliningTarget,
-                    @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Exclusive @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
                     @Exclusive @Cached LookupInheritedAttributeNode.Dynamic lookupGetattributeNode,
                     @Exclusive @Cached CallBinaryMethodNode callGetattributeNode,
                     @Exclusive @Cached PExecuteNode executeNode,
@@ -750,8 +744,8 @@ public Object getMembers(boolean includeInternal,
     @ExportMessage
     public void removeMember(String member,
                     @Bind("$node") Node inliningTarget,
-                    @Cached PyObjectSetAttr deleteAttributeNode,
-                    @Shared("js2ts") @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
+                    @Exclusive @Cached PyObjectSetAttr deleteAttributeNode,
+                    @Exclusive @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
                     // GR-44020: make shared:
                     @Exclusive @Cached IsBuiltinObjectProfile attrErrorProfile,
                     @Exclusive @Cached GilNode gil) throws UnsupportedMessageException, UnknownIdentifierException {
@@ -1268,37 +1262,6 @@ public static boolean isImmutable(Node inliningTarget, Object object,
         }
     }
 
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.subscript.GetItemNode' but with an
-     * uncached version.
-     */
-    @GenerateUncached
-    @ImportStatic(SpecialMethodSlot.class)
-    @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 19
-    public abstract static class PInteropSubscriptNode extends Node {
-
-        public abstract Object execute(Object primary, Object index);
-
-        @Specialization
-        static Object doSpecialObject(Object primary, Object index,
-                        @Bind("this") Node inliningTarget,
-                        @Cached GetClassNode getClassNode,
-                        @Cached(parameters = "GetItem") LookupCallableSlotInMRONode lookupInMRONode,
-                        @Cached CallBinaryMethodNode callGetItemNode,
-                        @Cached PRaiseNode raiseNode,
-                        @Cached InlinedConditionProfile profile) {
-            Object attrGetItem = lookupInMRONode.execute(getClassNode.execute(inliningTarget, primary));
-            if (profile.profile(inliningTarget, attrGetItem == PNone.NO_VALUE)) {
-                throw raiseNode.raise(PythonBuiltinClassType.TypeError, ErrorMessages.OBJ_NOT_SUBSCRIPTABLE, primary);
-            }
-            return callGetItemNode.executeObject(attrGetItem, primary, index);
-        }
-
-        public static PInteropSubscriptNode getUncached() {
-            return PythonAbstractObjectFactory.PInteropSubscriptNodeGen.getUncached();
-        }
-    }
-
     @GenerateUncached
     @ReportPolymorphism
     @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 17
@@ -1418,185 +1381,6 @@ boolean isArrayElementReadable(long index) {
         }
     }
 
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.attributes.GetAttributeNode' but with an
-     * uncached version.
-     */
-    @GenerateUncached
-    @GenerateInline
-    @GenerateCached(false)
-    public abstract static class PInteropGetAttributeNode extends Node {
-
-        public abstract Object execute(Node inliningTarget, Object object, Object attrName);
-
-        public static Object executeUncached(Object object, Object attrName) {
-            return PInteropGetAttributeNodeGen.getUncached().execute(null, object, attrName);
-        }
-
-        @Specialization(limit = "2")
-        static Object doIt(Node inliningTarget, Object object, Object attrName,
-                        @CachedLibrary("attrName") InteropLibrary libAttrName,
-                        // GR-44020: make shared:
-                        @Exclusive @Cached PRaiseNode.Lazy raiseNode,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupGetattributeNode,
-                        @Cached(inline = false) CallBinaryMethodNode callGetattributeNode,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupGetattrNode,
-                        @Cached(inline = false) CallBinaryMethodNode callGetattrNode,
-                        @Cached(inline = false) TruffleString.SwitchEncodingNode switchEncodingNode,
-                        @Cached IsBuiltinObjectProfile isBuiltinClassProfile,
-                        @Cached InlinedConditionProfile hasGetattrProfile) {
-            if (!libAttrName.isString(attrName)) {
-                throw raiseNode.get(inliningTarget).raise(TypeError, ErrorMessages.ATTR_NAME_MUST_BE_STRING, attrName);
-            }
-
-            TruffleString attrNameStr;
-            try {
-                attrNameStr = switchEncodingNode.execute(libAttrName.asTruffleString(attrName), TS_ENCODING);
-            } catch (UnsupportedMessageException e) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                throw new IllegalStateException("should not be reached");
-            }
-
-            try {
-                Object attrGetattribute = lookupGetattributeNode.execute(inliningTarget, object, T___GETATTRIBUTE__);
-                return callGetattributeNode.executeObject(attrGetattribute, object, attrNameStr);
-            } catch (PException pe) {
-                pe.expect(inliningTarget, AttributeError, isBuiltinClassProfile);
-                Object attrGetattr = lookupGetattrNode.execute(inliningTarget, object, T___GETATTR__);
-                if (hasGetattrProfile.profile(inliningTarget, attrGetattr != PNone.NO_VALUE)) {
-                    return callGetattrNode.executeObject(attrGetattr, object, attrNameStr);
-                }
-                throw pe;
-            }
-        }
-    }
-
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.subscript.SetItemNode' but with an
-     * uncached version.
-     */
-    @GenerateUncached
-    @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 17
-    public abstract static class PInteropSubscriptAssignNode extends Node {
-
-        public abstract void execute(PythonAbstractObject primary, Object key, Object value) throws UnsupportedMessageException;
-
-        @Specialization
-        static void doSpecialObject(PythonAbstractObject primary, Object key, Object value,
-                        @Bind("this") Node inliningTarget,
-                        @Cached PForeignToPTypeNode convert,
-                        @Cached PInteropGetAttributeNode getAttributeNode,
-                        @Cached CallBinaryMethodNode callSetItemNode,
-                        @Cached InlinedConditionProfile profile) throws UnsupportedMessageException {
-
-            Object attrSetitem = getAttributeNode.execute(inliningTarget, primary, T___SETITEM__);
-            if (profile.profile(inliningTarget, attrSetitem != PNone.NO_VALUE)) {
-                callSetItemNode.executeObject(attrSetitem, key, convert.executeConvert(value));
-            } else {
-                throw UnsupportedMessageException.create();
-            }
-        }
-    }
-
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.attributes.SetAttributeNode' but with an
-     * uncached version.
-     */
-    @GenerateUncached
-    @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 19
-    public abstract static class PInteropSetAttributeNode extends Node {
-
-        public abstract void execute(Object primary, TruffleString attrName, Object value) throws UnsupportedMessageException, UnknownIdentifierException;
-
-        @Specialization
-        public static void doSpecialObject(PythonAbstractObject primary, TruffleString attrName, Object value,
-                        @Bind("this") Node inliningTarget,
-                        @Cached PForeignToPTypeNode convert,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupSetAttrNode,
-                        @Cached CallTernaryMethodNode callSetAttrNode,
-                        @Cached InlinedConditionProfile profile,
-                        @Cached IsBuiltinObjectProfile attrErrorProfile) throws UnsupportedMessageException, UnknownIdentifierException {
-            Object attrSetattr = lookupSetAttrNode.execute(inliningTarget, primary, SpecialMethodNames.T___SETATTR__);
-            if (profile.profile(inliningTarget, attrSetattr != PNone.NO_VALUE)) {
-                try {
-                    callSetAttrNode.execute(null, attrSetattr, primary, attrName, convert.executeConvert(value));
-                } catch (PException e) {
-                    e.expectAttributeError(inliningTarget, attrErrorProfile);
-                    // TODO(fa) not accurate; distinguish between read-only and non-existing
-                    throw UnknownIdentifierException.create(attrName.toJavaStringUncached());
-                }
-            } else {
-                throw UnsupportedMessageException.create();
-            }
-        }
-
-        public static PInteropSetAttributeNode getUncached() {
-            return PythonAbstractObjectFactory.PInteropSetAttributeNodeGen.getUncached();
-        }
-    }
-
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.subscript.DelItemNode' but with an
-     * uncached version.
-     */
-    @GenerateUncached
-    @GenerateInline
-    @GenerateCached(false)
-    public abstract static class PInteropDeleteItemNode extends Node {
-
-        public abstract void execute(Node inliningTarget, Object primary, Object key) throws UnsupportedMessageException;
-
-        @Specialization
-        public static void doSpecialObject(Node inliningTarget, PythonAbstractObject primary, Object key,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupSetAttrNode,
-                        @Cached(inline = false) CallBinaryMethodNode callSetAttrNode,
-                        @Cached InlinedConditionProfile profile) throws UnsupportedMessageException {
-            Object attrDelattr = lookupSetAttrNode.execute(inliningTarget, primary, T___DELITEM__);
-            if (profile.profile(inliningTarget, attrDelattr != PNone.NO_VALUE)) {
-                callSetAttrNode.executeObject(attrDelattr, primary, key);
-            } else {
-                throw UnsupportedMessageException.create();
-            }
-        }
-    }
-
-    /*
-     * Basically the same as 'com.oracle.graal.python.nodes.attributes.DeleteAttributeNode' but with
-     * an uncached version.
-     */
-    @GenerateUncached
-    @SuppressWarnings("truffle-inlining")       // footprint reduction 36 -> 19
-    public abstract static class PInteropDeleteAttributeNode extends Node {
-
-        public abstract void execute(Object primary, String attrName) throws UnsupportedMessageException, UnknownIdentifierException;
-
-        @Specialization
-        public void doSpecialObject(PythonAbstractObject primary, String attrName,
-                        @Bind("this") Node inliningTarget,
-                        @Cached TruffleString.FromJavaStringNode fromJavaStringNode,
-                        @Cached LookupInheritedAttributeNode.Dynamic lookupSetAttrNode,
-                        @Cached CallBinaryMethodNode callSetAttrNode,
-                        @Cached InlinedConditionProfile profile,
-                        @Cached IsBuiltinObjectProfile attrErrorProfile) throws UnsupportedMessageException, UnknownIdentifierException {
-            Object attrDelattr = lookupSetAttrNode.execute(inliningTarget, primary, SpecialMethodNames.T___DELATTR__);
-            if (profile.profile(inliningTarget, attrDelattr != PNone.NO_VALUE)) {
-                try {
-                    callSetAttrNode.executeObject(attrDelattr, primary, fromJavaStringNode.execute(attrName, TS_ENCODING));
-                } catch (PException e) {
-                    e.expectAttributeError(inliningTarget, attrErrorProfile);
-                    // TODO(fa) not accurate; distinguish between read-only and non-existing
-                    throw UnknownIdentifierException.create(attrName);
-                }
-            } else {
-                throw UnsupportedMessageException.create();
-            }
-        }
-
-        public static PInteropDeleteAttributeNode getUncached() {
-            return PythonAbstractObjectFactory.PInteropDeleteAttributeNodeGen.getUncached();
-        }
-    }
-
     @ExportMessage
     public boolean hasLanguage() {
         return true;