[GR-31702] add couple of native missing functions

PullRequest: graalpython/1821

Author: qunaibit

graalpython/com.oracle.graal.python.cext/include/cpython/abstract.h

@@ -155,7 +155,7 @@ _PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs)
 /* Call a callable without any arguments */
 static inline PyObject *
 _PyObject_CallNoArg(PyObject *func) {
-    return _PyObject_Vectorcall(func, NULL, 0, NULL);
+    return PyObject_CallObject(func, NULL); /* Truffle change: redirect to PyObject_CallObject until _PyObject_Vectorcall is implemented */
 }
 
 PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(

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

@@ -67,6 +67,16 @@ PyObject* PyDict_GetItemWithError(PyObject* d, PyObject* k) {
     return UPCALL_CEXT_BORROWED(_jls_PyDict_GetItemWithError, native_to_java(d), native_to_java(k));
 }
 
+PyObject *
+_PyDict_GetItemIdWithError(PyObject *dp, struct _Py_Identifier *key)
+{
+    PyObject *kv;
+    kv = _PyUnicode_FromId(key); /* borrowed */
+    if (kv == NULL)
+        return NULL;
+    return PyDict_GetItemWithError(dp, kv);
+}
+
 PyObject* _PyDict_GetItemId(PyObject* d, _Py_Identifier* id) {
     return PyDict_GetItemString(d, id->string);
 }

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

@@ -433,6 +433,68 @@ PyObject * PyObject_GetAttr(PyObject *v, PyObject *name) {
     return NULL;
 }
 
+// taken from CPython "Objects/object.c"
+int _PyObject_LookupAttr(PyObject *v, PyObject *name, PyObject **result)
+{
+    PyTypeObject *tp = Py_TYPE(v);
+
+    if (!PyUnicode_Check(name)) {
+        PyErr_Format(PyExc_TypeError,
+                     "attribute name must be string, not '%.200s'",
+                     name->ob_type->tp_name);
+        *result = NULL;
+        return -1;
+    }
+
+    /* Truffle change: this fast path is only applicable to cpython
+    if (tp->tp_getattro == PyObject_GenericGetAttr) {
+        *result = _PyObject_GenericGetAttrWithDict(v, name, NULL, 1);
+        if (*result != NULL) {
+            return 1;
+        }
+        if (PyErr_Occurred()) {
+            return -1;
+        }
+        return 0;
+    }
+    */
+    if (tp->tp_getattro != NULL) {
+        *result = (*tp->tp_getattro)(v, name);
+    }
+    else if (tp->tp_getattr != NULL) {
+        const char *name_str = PyUnicode_AsUTF8(name);
+        if (name_str == NULL) {
+            *result = NULL;
+            return -1;
+        }
+        *result = (*tp->tp_getattr)(v, (char *)name_str);
+    }
+    else {
+        *result = NULL;
+        return 0;
+    }
+
+    if (*result != NULL) {
+        return 1;
+    }
+    if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+        return -1;
+    }
+    PyErr_Clear();
+    return 0;
+}
+
+// taken from CPython "Objects/object.c"
+int _PyObject_LookupAttrId(PyObject *v, _Py_Identifier *name, PyObject **result)
+{
+    PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
+    if (!oname) {
+        *result = NULL;
+        return -1;
+    }
+    return  _PyObject_LookupAttr(v, oname, result);
+}
+
 UPCALL_ID(PyObject_GenericGetAttr);
 PyObject* PyObject_GenericGetAttr(PyObject* obj, PyObject* attr) {
     PyTypeObject *tp = Py_TYPE(obj);
@@ -486,6 +548,17 @@ int PyObject_SetAttr(PyObject *v, PyObject *name, PyObject *value) {
     return -1;
 }
 
+// taken from CPython "Objects/object.c"
+int _PyObject_SetAttrId(PyObject *v, _Py_Identifier *name, PyObject *w)
+{
+    int result;
+    PyObject *oname = _PyUnicode_FromId(name); /* borrowed */
+    if (!oname)
+        return -1;
+    result = PyObject_SetAttr(v, oname, w);
+    return result;
+}
+
 UPCALL_ID(PyObject_GenericSetAttr);
 int PyObject_GenericSetAttr(PyObject* obj, PyObject* attr, PyObject* value) {
     PyTypeObject *tp = Py_TYPE(obj);

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

@@ -147,6 +147,15 @@ def forgiving_len(o):
         argspec="OOO",
         callfunction="wrap_PyObject_Call",
     )
+    test__PyObject_CallNoArg = CPyExtFunction(
+        lambda args: args[0](),
+        lambda: (
+            (dict, ),
+            (list, ),
+        ),
+        arguments=["PyObject* callable"],
+        argspec="O",
+    )
     test_PyObject_CallObject = CPyExtFunction(
         lambda args: args[0](*args[1]),
         lambda: (