[GR-34916] Intrinsify python_cext - datetime capi.

PullRequest: graalpython/2135

Author: tomasstupka

graalpython/com.oracle.graal.python.cext/include/Python.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -136,7 +136,6 @@
 #include "pythread.h"
 #include "funcobject.h"
 #include "iterobject.h"
-#include "datetime.h"
 #include "typeslots.h"
 #include "weakrefobject.h"
 #include "sysmodule.h"

graalpython/com.oracle.graal.python.cext/src/capi.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -49,6 +49,7 @@
 #include "Python.h"
 #include <truffle.h>
 #include <graalvm/llvm/handles.h>
+#include "datetime.h"
 
 #define SRC_CS "utf-8"
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -70,9 +70,7 @@ POLYGLOT_DECLARE_TYPE(PyDateTime_Delta);
 POLYGLOT_DECLARE_TYPE(PyDateTime_TZInfo);
 
 /** to be used from Java code only; returns the type ID for a PyDateTime_CAPI */
-extern PyObject* set_PyDateTime_typeids(PyTypeObject* dtcapiType, PyTypeObject* dateType, PyTypeObject* dateTimeType, PyTypeObject* timeType, PyTypeObject* deltaType, PyTypeObject* tzinfoType) {
-    polyglot_invoke(PY_TRUFFLE_CEXT, "PyTruffle_Set_SulongType", dtcapiType, polyglot_PyDateTime_CAPI_typeid());
-
+extern polyglot_typeid set_PyDateTime_typeids(PyTypeObject* dateType, PyTypeObject* dateTimeType, PyTypeObject* timeType, PyTypeObject* deltaType, PyTypeObject* tzinfoType) {
     /* safe native get/set descriptors */
     PyGetSetDef* getsets_date= PyDateTime_DateType.tp_getset;
     PyGetSetDef* getsets_time = PyDateTime_TimeType.tp_getset;
@@ -91,7 +89,7 @@ extern PyObject* set_PyDateTime_typeids(PyTypeObject* dtcapiType, PyTypeObject*
     register_native_slots(&PyDateTime_TimeType, getsets_time, NULL);
     register_native_slots(&PyDateTime_DeltaType, NULL, members_delta);
 
-    return Py_True;
+    return polyglot_PyDateTime_CAPI_typeid();
 }
 
 BASICSIZE_GETTER(PyDateTime_Date);

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_abstract.py

@@ -421,6 +421,50 @@ def test_sequence_size(self):
         tester = TestSequenceSize()
         assert tester.callSize(tester) == 10
 
+    def test_sequence_size_err(self):
+        TestSequenceSizeErr = CPyExtType("TestSequenceSizeErr",
+                             """
+                             Py_ssize_t test_sq_length(PyObject* a) {
+                                 PyErr_Format(PyExc_TypeError, "test type error");
+                                 return -1;
+                             }
+                             PyObject* callSize(PyObject* a) {
+                                 return PyLong_FromSsize_t(PySequence_Size(a));
+                             }
+                             """,
+                             tp_methods='{"callSize", (PyCFunction)callSize, METH_O, ""}',
+                             sq_length="&test_sq_length",
+        )
+        tester = TestSequenceSizeErr()        
+        try:
+            tester.callSize(tester)
+        except SystemError:
+            assert True
+        else:
+            assert False
+            
+    def test_sequence_size_err2(self):
+        TestSequenceSizeErr2 = CPyExtType("TestSequenceSizeErr2",
+                             """
+                             Py_ssize_t test_sq_length(PyObject* a) {
+                                 PyErr_Format(PyExc_TypeError, "test type error");
+                                 return -2;
+                             }
+                             PyObject* callSize(PyObject* a) {
+                                 return PyLong_FromSsize_t(PySequence_Size(a));
+                             }
+                             """,
+                             tp_methods='{"callSize", (PyCFunction)callSize, METH_O, ""}',
+                             sq_length="&test_sq_length",
+        )
+        tester = TestSequenceSizeErr2()        
+        try:
+            tester.callSize(tester)
+        except SystemError:
+            assert True
+        else:
+            assert False            
+        
     def test_mapping_check(self):
         TestMappingCheck = CPyExtType("TestMappingCheck",
                              """
@@ -454,6 +498,28 @@ def test_mapping_size(self):
         tester = TestMappingSize()
         assert tester.callSize(tester) == 11
 
+    def test_mapping_size_err(self):
+        TestMappingSizeErr = CPyExtType("TestMappingSizeErr",
+                             """
+                             Py_ssize_t test_mp_length(PyObject* a) {
+                                 PyErr_Format(PyExc_TypeError, "test type error");
+                                 return -1;
+                             }
+                             PyObject* callSize(PyObject* a) {
+                                 return PyLong_FromSsize_t(PyMapping_Size(a));
+                             }
+                             """,
+                             tp_methods='{"callSize", (PyCFunction)callSize, METH_O, ""}',
+                             mp_length="&test_mp_length",
+        )
+        tester = TestMappingSizeErr()   
+        try:
+            tester.callSize(tester)
+        except SystemError:
+            assert True
+        else:
+            assert False
+        
     def test_object_size_sq(self):
         TestObjectSizeSQ = CPyExtType("TestObjectSizeSQ",
                              """
@@ -486,6 +552,28 @@ def test_object_size_mp(self):
         tester = TestObjectSizeMP()
         assert tester.callSize(tester) == 13            
 
+    def test_object_size_err(self):
+        TestObjectSizeErr = CPyExtType("TestObjectSizeErr",
+                             """
+                             Py_ssize_t test_sq_length(PyObject* a) {
+                                 PyErr_Format(PyExc_TypeError, "test type error");
+                                 return -1;
+                             }
+                             PyObject* callSize(PyObject* a) {
+                                 return PyLong_FromSsize_t(PyObject_Size(a));
+                             }
+                             """,
+                             tp_methods='{"callSize", (PyCFunction)callSize, METH_O, ""}',
+                             mp_length="&test_sq_length",
+        )
+        tester = TestObjectSizeErr()
+        try:
+            tester.callSize(tester)
+        except SystemError:
+            assert True
+        else:
+            assert False         
+        
 class TestAbstract(CPyExtTestCase):
 
     def compile_module(self, name):