Check method flags in PySequence lib nodes

Author: msimacek

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTiming;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
+import com.oracle.graal.python.builtins.objects.type.MethodsFlags;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -89,18 +90,17 @@ public final Object execute(Object object, int index) {
     static Object doGenericManaged(VirtualFrame frame, Object object, int index,
                     @Bind("this") Node inliningTarget,
                     @Cached GetClassNode getClassNode,
-                    @Cached PySequenceCheckNode sequenceCheckNode,
-                    @Cached PyMappingCheckNode mappingCheckNode,
+                    @Cached GetMethodsFlagsNode getMethodsFlagsNode,
                     @Cached(parameters = "DelItem") LookupSpecialMethodSlotNode lookupDelItem,
                     @Cached CallBinaryMethodNode callDelItem,
                     @Cached PRaiseNode.Lazy raise) {
-        if (sequenceCheckNode.execute(inliningTarget, object)) {
-            Object type = getClassNode.execute(inliningTarget, object);
+        Object type = getClassNode.execute(inliningTarget, object);
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.SQ_ASS_ITEM) != 0) {
             Object delItem = lookupDelItem.execute(frame, type, object);
             assert delItem != PNone.NO_VALUE;
             return callDelItem.executeObject(frame, delItem, object, index);
         }
-        if (mappingCheckNode.execute(inliningTarget, object)) {
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.MP_ASS_SUBSCRIPT) != 0) {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, object);
         } else {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_DELETION, object);

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTiming;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
+import com.oracle.graal.python.builtins.objects.type.MethodsFlags;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -89,18 +90,17 @@ public final Object execute(Object object, int index) {
     static Object doGenericManaged(VirtualFrame frame, Object object, int index,
                     @Bind("this") Node inliningTarget,
                     @Cached GetClassNode getClassNode,
-                    @Cached PySequenceCheckNode sequenceCheckNode,
-                    @Cached PyMappingCheckNode mappingCheckNode,
+                    @Cached GetMethodsFlagsNode getMethodsFlagsNode,
                     @Cached(parameters = "GetItem") LookupSpecialMethodSlotNode lookupGetItem,
                     @Cached CallBinaryMethodNode callGetItem,
                     @Cached PRaiseNode.Lazy raise) {
-        if (sequenceCheckNode.execute(inliningTarget, object)) {
-            Object type = getClassNode.execute(inliningTarget, object);
+        Object type = getClassNode.execute(inliningTarget, object);
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.SQ_ITEM) != 0) {
             Object getItem = lookupGetItem.execute(frame, type, object);
             assert getItem != PNone.NO_VALUE;
             return callGetItem.executeObject(frame, getItem, object, index);
         }
-        if (mappingCheckNode.execute(inliningTarget, object)) {
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.MP_SUBSCRIPT) != 0) {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, object);
         } else {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.OBJ_DOES_NOT_SUPPORT_INDEXING, object);

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

@@ -51,6 +51,7 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTiming;
 import com.oracle.graal.python.builtins.objects.cext.capi.transitions.CApiTransitions;
+import com.oracle.graal.python.builtins.objects.type.MethodsFlags;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PGuards;
@@ -89,18 +90,17 @@ public final Object execute(Object object, int index, Object value) {
     static Object doGenericManaged(VirtualFrame frame, Object object, int index, Object value,
                     @Bind("this") Node inliningTarget,
                     @Cached GetClassNode getClassNode,
-                    @Cached PySequenceCheckNode sequenceCheckNode,
-                    @Cached PyMappingCheckNode mappingCheckNode,
+                    @Cached GetMethodsFlagsNode getMethodsFlagsNode,
                     @Cached(parameters = "SetItem") LookupSpecialMethodSlotNode lookupSetItem,
                     @Cached CallTernaryMethodNode callSetItem,
                     @Cached PRaiseNode.Lazy raise) {
-        if (sequenceCheckNode.execute(inliningTarget, object)) {
-            Object type = getClassNode.execute(inliningTarget, object);
+        Object type = getClassNode.execute(inliningTarget, object);
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.SQ_ASS_ITEM) != 0) {
             Object setItem = lookupSetItem.execute(frame, type, object);
             assert setItem != PNone.NO_VALUE;
             return callSetItem.execute(frame, setItem, object, index, value);
         }
-        if (mappingCheckNode.execute(inliningTarget, object)) {
+        if ((getMethodsFlagsNode.execute(inliningTarget, type) & MethodsFlags.MP_ASS_SUBSCRIPT) != 0) {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, object);
         } else {
             throw raise.get(inliningTarget).raise(TypeError, ErrorMessages.OBJ_DOES_NOT_SUPPORT_ITEM_ASSIGMENT, object);