Only define tp_as_sequence/mapping when sq/mp_lenght is defined

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextSlotBuiltins.java

@@ -1247,8 +1247,13 @@ Object get(PythonManagedClass object,
     abstract static class Py_get_PyTypeObject_tp_as_mapping extends CApiUnaryBuiltinNode {
 
         @Specialization
-        public Object get(PythonManagedClass object) {
-            return new PyMappingMethodsWrapper(object);
+        public Object get(PythonManagedClass object,
+                        @Cached LookupNativeSlotNode lookupLen) {
+            if (lookupLen.execute(object, SlotMethodDef.MP_LENGTH) != getNULL()) {
+                return new PyMappingMethodsWrapper(object);
+            } else {
+                return getNULL();
+            }
         }
     }
 
@@ -1266,8 +1271,13 @@ static Object get(PythonManagedClass object) {
     abstract static class Py_get_PyTypeObject_tp_as_sequence extends CApiUnaryBuiltinNode {
 
         @Specialization
-        public Object get(PythonManagedClass object) {
-            return new PySequenceMethodsWrapper(object);
+        public Object get(PythonManagedClass object,
+                        @Cached LookupNativeSlotNode lookupLen) {
+            if (lookupLen.execute(object, SlotMethodDef.SQ_LENGTH) != getNULL()) {
+                return new PySequenceMethodsWrapper(object);
+            } else {
+                return getNULL();
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/DynamicObjectNativeWrapper.java

@@ -513,13 +513,25 @@ Object doTpAsBuffer(PythonManagedClass object, @SuppressWarnings("unused") Pytho
         }
 
         @Specialization(guards = "eq(TP_AS_SEQUENCE, key)")
-        Object doTpAsSequence(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
-            return new PySequenceMethodsWrapper(object);
+        Object doTpAsSequence(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
+                        @Cached LookupNativeSlotNode lookupLen) {
+            Object nativeNull = getContext().getNativeNull().getPtr();
+            if (lookupLen.execute(object, SlotMethodDef.SQ_LENGTH) != nativeNull) {
+                return new PySequenceMethodsWrapper(object);
+            } else {
+                return nativeNull;
+            }
         }
 
         @Specialization(guards = "eq(TP_AS_MAPPING, key)")
-        Object doTpAsMapping(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key) {
-            return new PyMappingMethodsWrapper(object);
+        Object doTpAsMapping(PythonManagedClass object, @SuppressWarnings("unused") PythonNativeWrapper nativeWrapper, @SuppressWarnings("unused") String key,
+                        @Cached LookupNativeSlotNode lookupLen) {
+            Object nativeNull = getContext().getNativeNull().getPtr();
+            if (lookupLen.execute(object, SlotMethodDef.MP_LENGTH) != nativeNull) {
+                return new PyMappingMethodsWrapper(object);
+            } else {
+                return nativeNull;
+            }
         }
 
         @Specialization(guards = "eq(TP_NEW, key)")