implemented PySequence_Size

Author: tomasstupka

graalpython/com.oracle.graal.python.cext/src/abstract.c

@@ -285,9 +285,34 @@ int PySequence_Check(PyObject *s) {
     return UPCALL_CEXT_I(_jls_PySequence_Check, native_to_java(s));
 }
 
-UPCALL_ID(PyObject_Size);
+UPCALL_ID(PySequence_Size);
 Py_ssize_t PySequence_Size(PyObject *s) {
-    return UPCALL_CEXT_L(_jls_PyObject_Size, native_to_java(s));
+    return UPCALL_CEXT_L(_jls_PySequence_Size, native_to_java(s));
+}
+
+// taken from CPython "Objects/abstract.c"
+// called for native python objects
+Py_ssize_t PyTruffle_Sequence_Size(PyObject *s) {
+    PySequenceMethods *m;
+
+    if (s == NULL) {
+        null_error();
+        return -1;
+    }
+
+    m = s->ob_type->tp_as_sequence;
+    if (m && m->sq_length) {
+        Py_ssize_t len = m->sq_length(s);
+        assert(len >= 0 || PyErr_Occurred());
+        return len;
+    }
+
+    if (s->ob_type->tp_as_mapping && s->ob_type->tp_as_mapping->mp_length) {
+        PyErr_Format(PyExc_TypeError, "%s is not a sequence", s);
+        return -1;
+    }
+    PyErr_Format(PyExc_TypeError, "object of type '%s' has no len()", Py_TYPE(s)->tp_name);
+    return -1;    
 }
 
 UPCALL_ID(PySequence_Contains);

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

@@ -73,13 +73,17 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AddRefCntNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.AsPythonObjectNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PCallCapiFunction;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.PRaiseNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToNewRefNode;
+import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.ToSulongNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodes.TransformExceptionToNativeNode;
 import com.oracle.graal.python.builtins.objects.cext.capi.DynamicObjectNativeWrapper.PrimitiveNativeWrapper;
 import com.oracle.graal.python.builtins.objects.common.HashingCollectionNodes;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
 import com.oracle.graal.python.builtins.objects.common.SequenceNodes;
+import com.oracle.graal.python.builtins.objects.cext.capi.ExternalFunctionNodes.DefaultCheckFunctionResultNode;
+import static com.oracle.graal.python.builtins.objects.cext.capi.NativeCAPISymbol.FUN_PY_TRUFFLE_SEQUENCE_SIZE;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins.ItemsNode;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins.KeysNode;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins.ValuesNode;
@@ -112,6 +116,7 @@
 import com.oracle.graal.python.nodes.object.IsBuiltinClassProfile;
 import com.oracle.graal.python.nodes.subscript.SliceLiteralNode;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
+import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.CompilerDirectives;
@@ -928,7 +933,7 @@ Object run(VirtualFrame frame, Object o, Object i,
 
     @Builtin(name = "PySequence_Check", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
-    abstract static class PySequenceCheck extends PythonUnaryBuiltinNode {
+    abstract static class PyCextSequenceCheckNode extends PythonUnaryBuiltinNode {
         @Specialization
         static boolean check(Object object,
                         @Cached PySequenceCheckNode check) {
@@ -962,6 +967,43 @@ Object doManaged(VirtualFrame frame, Object listWrapper, Object position,
         }
     }
 
+    @Builtin(name = "PySequence_Size", minNumOfPositionalArgs = 1)
+    @GenerateNodeFactory
+    @ImportStatic(SpecialMethodNames.class)
+    abstract static class PySequenceSizeNode extends PythonUnaryBuiltinNode {
+
+        @Specialization(guards = "checkNode.execute(obj)")
+        static int doSequence(VirtualFrame frame, Object obj,
+                        @SuppressWarnings("unused") @Cached PySequenceCheckNode checkNode,
+                        @Cached PyObjectSizeNode sizeNode,
+                        @Cached TransformExceptionToNativeNode transformExceptionToNativeNode) {
+            try {
+                return sizeNode.execute(frame, obj);
+            } catch (PException e) {
+                transformExceptionToNativeNode.execute(frame, e);
+                return -1;
+            }
+        }
+
+        @Specialization(guards = "isNativeObject(obj)")
+        static Object doNative(VirtualFrame frame, Object obj,
+                        @Cached ToSulongNode toSulongNode,
+                        @Cached AsPythonObjectNode asPythonObjectNode,
+                        @Cached PCallCapiFunction callCapiFunction,
+                        @Cached DefaultCheckFunctionResultNode checkFunctionResultNode) {
+            Object result = callCapiFunction.call(FUN_PY_TRUFFLE_SEQUENCE_SIZE, toSulongNode.execute(obj));
+            checkFunctionResultNode.execute(PythonContext.get(callCapiFunction), FUN_PY_TRUFFLE_SEQUENCE_SIZE.getName(), result);
+            return asPythonObjectNode.execute(result);
+        }
+
+        @Specialization(guards = {"!isNativeObject(obj)", "!checkNode.execute(obj)"})
+        Object notSequence(VirtualFrame frame, Object obj,
+                        @SuppressWarnings("unused") @Cached PySequenceCheckNode checkNode,
+                        @Cached PRaiseNativeNode raiseNativeNode) {
+            return raiseNativeNode.raiseInt(frame, -1, TypeError, ErrorMessages.IS_NOT_A_SEQUENCE, obj);
+        }
+    }
+
     /////// PyObject ///////
 
     @Builtin(name = "PyObject_GetItem", minNumOfPositionalArgs = 2)

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

@@ -167,6 +167,7 @@ public enum NativeCAPISymbol implements NativeCExtSymbol {
     FUN_PY_TRUFFLE_MEMORYVIEW_FROM_BUFFER("PyTruffle_MemoryViewFromBuffer"),
     FUN_PY_TRUFFLE_MEMORYVIEW_FROM_OBJECT("PyTruffle_MemoryViewFromObject"),
     FUN_PY_TRUFFLE_RELEASE_BUFFER("PyTruffle_ReleaseBuffer"),
+    FUN_PY_TRUFFLE_SEQUENCE_SIZE("PyTruffle_Sequence_Size"),
     FUN_GET_INT_T_TYPEID("get_int_t_typeid"),
     FUN_GET_INT8_T_TYPEID("get_int8_t_typeid"),
     FUN_GET_INT16_T_TYPEID("get_int16_t_typeid"),