Merge pull request #3297 from davidhewitt/pypy-ssize-t

fix `SystemError` raised from `PyUnicodeDecodeError_Create` on PyPy 3.10

newsfragments/3297.added.md

@@ -0,0 +1 @@
+Add FFI definitions `_PyObject_CallFunction_SizeT` and `_PyObject_CallMethod_SizeT`.

newsfragments/3297.fixed.md

@@ -0,0 +1 @@
+Fix `SystemError` raised in `PyUnicodeDecodeError_Create` on PyPy 3.10.

pyo3-ffi/src/abstract_.rs

@@ -52,8 +52,21 @@ extern "C" {
         ...
     ) -> *mut PyObject;
 
-    // skipped _PyObject_CallFunction_SizeT
-    // skipped _PyObject_CallMethod_SizeT
+    #[cfg(not(Py_3_13))]
+    #[cfg_attr(PyPy, link_name = "_PyPyObject_CallFunction_SizeT")]
+    pub fn _PyObject_CallFunction_SizeT(
+        callable_object: *mut PyObject,
+        format: *const c_char,
+        ...
+    ) -> *mut PyObject;
+    #[cfg(not(Py_3_13))]
+    #[cfg_attr(PyPy, link_name = "_PyPyObject_CallMethod_SizeT")]
+    pub fn _PyObject_CallMethod_SizeT(
+        o: *mut PyObject,
+        method: *const c_char,
+        format: *const c_char,
+        ...
+    ) -> *mut PyObject;
 
     #[cfg_attr(PyPy, link_name = "PyPyObject_CallFunctionObjArgs")]
     pub fn PyObject_CallFunctionObjArgs(callable: *mut PyObject, ...) -> *mut PyObject;

pyo3-ffi/src/pyerrors.rs

@@ -99,7 +99,7 @@ pub unsafe fn PyUnicodeDecodeError_Create(
     end: Py_ssize_t,
     reason: *const c_char,
 ) -> *mut PyObject {
-    crate::PyObject_CallFunction(
+    crate::_PyObject_CallFunction_SizeT(
         PyExc_UnicodeDecodeError,
         b"sy#nns\0".as_ptr().cast::<c_char>(),
         encoding,