Replace PInteropSubscriptNode with PyObjectGetItem

Author: steve-s

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

@@ -108,6 +108,7 @@
 import com.oracle.graal.python.lib.GetNextNode;
 import com.oracle.graal.python.lib.PyCallableCheckNode;
 import com.oracle.graal.python.lib.PyMappingCheckNode;
+import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectGetIter;
 import com.oracle.graal.python.lib.PyObjectLookupAttr;
 import com.oracle.graal.python.lib.PyObjectSetAttr;
@@ -694,7 +695,7 @@ public Object getMembers(boolean includeInternal,
                     // GR-44020: make shared:
                     @Exclusive @Cached PyObjectLookupAttr lookupKeys,
                     @Cached CallNode callKeys,
-                    @Cached PInteropSubscriptNode getItemNode,
+                    @Cached PyObjectGetItem getItemNode,
                     @Cached SequenceNodes.LenNode lenNode,
                     @Cached TypeNodes.GetMroNode getMroNode,
                     @Cached TruffleString.CodePointLengthNode codePointLengthNode,
@@ -723,7 +724,7 @@ public Object getMembers(boolean includeInternal,
                         PList mapKeys = castToList.executeWithGlobalState(callKeys.execute(keysMethod));
                         int len = lenNode.execute(inliningTarget, mapKeys);
                         for (int i = 0; i < len; i++) {
-                            Object key = getItemNode.execute(mapKeys, i);
+                            Object key = getItemNode.execute(null, inliningTarget, mapKeys, i);
                             TruffleString tsKey = null;
                             if (key instanceof TruffleString) {
                                 tsKey = (TruffleString) key;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyNodes.java

@@ -63,7 +63,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropSubscriptNode;
 import com.oracle.graal.python.builtins.objects.cext.PythonAbstractNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeObject;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.CreateFunctionNode;
@@ -127,6 +126,7 @@
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.HasSameConstructorNode;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsTypeNode;
 import com.oracle.graal.python.lib.PyObjectCallMethodObjArgs;
+import com.oracle.graal.python.lib.PyObjectGetItem;
 import com.oracle.graal.python.lib.PyObjectIsTrueNode;
 import com.oracle.graal.python.nodes.BuiltinNames;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -2913,11 +2913,11 @@ public abstract static class RecursiveExceptionMatches extends Node {
         static int tuple(GraalHPyContext context, Object err, PTuple exc,
                         @Bind("this") Node inliningTarget,
                         @Shared @Cached RecursiveExceptionMatches recExcMatch,
-                        @Exclusive @Cached PInteropSubscriptNode getItemNode,
+                        @Exclusive @Cached PyObjectGetItem getItemNode,
                         @Exclusive @Cached InlinedLoopConditionProfile loopProfile) {
             int len = exc.getSequenceStorage().length();
             for (int i = 0; loopProfile.profile(inliningTarget, i < len); i++) {
-                Object e = getItemNode.execute(exc, i);
+                Object e = getItemNode.execute(null, inliningTarget, exc, i);
                 if (recExcMatch.execute(context, err, e) != 0) {
                     return 1;
                 }
@@ -2934,11 +2934,11 @@ static int subtuple(GraalHPyContext context, Object err, Object exc,
                         @Shared @Cached ReadAttributeFromObjectNode readAttr,
                         @Shared @Cached CallNode callNode,
                         @Cached CastToJavaIntExactNode cast,
-                        @Exclusive @Cached PInteropSubscriptNode getItemNode,
+                        @Exclusive @Cached PyObjectGetItem getItemNode,
                         @Exclusive @Cached InlinedLoopConditionProfile loopProfile) {
             int len = cast.execute(inliningTarget, callBuiltinFunction(context, BuiltinNames.T_LEN, new Object[]{exc}, readAttr, callNode));
             for (int i = 0; loopProfile.profile(inliningTarget, i < len); i++) {
-                Object e = getItemNode.execute(exc, i);
+                Object e = getItemNode.execute(null, inliningTarget, exc, i);
                 if (recExcMatch.execute(context, err, e) != 0) {
                     return 1;
                 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java

@@ -70,7 +70,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObject.PInteropSubscriptNode;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.capsule.PyCapsule;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodesFactory.AsNativePrimitiveNodeGen;
@@ -1883,7 +1882,7 @@ public long ctxGetItemi(long hCollection, long lidx) {
                 }
                 // TODO: other storages...
             }
-            Object result = PInteropSubscriptNode.getUncached().execute(receiver, lidx);
+            Object result = PyObjectGetItem.executeUncached(receiver, lidx);
             return GraalHPyBoxing.boxHandle(context.getHPyHandleForObject(result));
         } catch (PException e) {
             HPyTransformExceptionToNativeNode.executeUncached(context, e);