luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #3031 

3031: mangle exported functions for PyPy r=davidhewitt a=mattip

I run HEAD of PyO3 with HEAD of some PyPy branches, and noticed that the py3.10 branch (which implements python3.10) [fails to properly build](https://github.com/pypy/binary-testing/actions/runs/4334873617/jobs/7569059852#step:6:179). The failure was a missing export:
```
 /home/runner/work/binary-testing/binary-testing/pyo3/src/exceptions.rs:715: \
    undefined reference to `PyExc_EncodingWarning'
          collect2: error: ld returned 1 exit status
```

So I grepped around in the code for `Py_3_10` to see what new functions were added and found a few that needed PyPy-specific exports.

Co-authored-by: Matti Picus <matti.picus@gmail.com>
This commit is contained in:
bors[bot] 2023-03-10 09:39:54 +00:00 committed by GitHub
parent dd6498142f 232f9fb8ab
commit 550473fb1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newsfragments/3031.fixed.md Normal file
View File

@ -0,0 +1 @@
Mangle exported function names for PyPy

2
pyo3-ffi/src/abstract_.rs
View File

@ -25,6 +25,7 @@ extern "C" {
not(PyPy), not(PyPy),
any(Py_3_10, all(not(Py_LIMITED_API), Py_3_9)) // Added to python in 3.9 but to limited API in 3.10 any(Py_3_10, all(not(Py_LIMITED_API), Py_3_9)) // Added to python in 3.9 but to limited API in 3.10
))] ))]
#[cfg_attr(PyPy, link_name = "PyPyObject_CallNoArgs")]
pub fn PyObject_CallNoArgs(func: *mut PyObject) -> *mut PyObject; pub fn PyObject_CallNoArgs(func: *mut PyObject) -> *mut PyObject;
#[cfg_attr(PyPy, link_name = "PyPyObject_Call")] #[cfg_attr(PyPy, link_name = "PyPyObject_Call")]
pub fn PyObject_Call( pub fn PyObject_Call(
@ -113,6 +114,7 @@ extern "C" {
#[cfg_attr(PyPy, link_name = "PyPyIter_Next")] #[cfg_attr(PyPy, link_name = "PyPyIter_Next")]
pub fn PyIter_Next(arg1: *mut PyObject) -> *mut PyObject; pub fn PyIter_Next(arg1: *mut PyObject) -> *mut PyObject;
#[cfg(all(not(PyPy), Py_3_10))] #[cfg(all(not(PyPy), Py_3_10))]
#[cfg_attr(PyPy, link_name = "PyPyIter_Send")]
pub fn PyIter_Send(iter: *mut PyObject, arg: *mut PyObject, presult: *mut *mut PyObject); pub fn PyIter_Send(iter: *mut PyObject, arg: *mut PyObject, presult: *mut *mut PyObject);
#[cfg_attr(PyPy, link_name = "PyPyNumber_Check")] #[cfg_attr(PyPy, link_name = "PyPyNumber_Check")]

1
pyo3-ffi/src/modsupport.rs
View File

@ -54,6 +54,7 @@ extern "C" {
// skipped non-limited _PyArg_Fini // skipped non-limited _PyArg_Fini
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyModule_AddObjectRef")]
pub fn PyModule_AddObjectRef( pub fn PyModule_AddObjectRef(
module: *mut PyObject, module: *mut PyObject,
name: *const c_char, name: *const c_char,

3
pyo3-ffi/src/objimpl.rs
View File

@ -30,12 +30,15 @@ extern "C" {
pub fn PyGC_Collect() -> Py_ssize_t; pub fn PyGC_Collect() -> Py_ssize_t;
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyGC_Enable")]
pub fn PyGC_Enable() -> c_int; pub fn PyGC_Enable() -> c_int;
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyGC_Disable")]
pub fn PyGC_Disable() -> c_int; pub fn PyGC_Disable() -> c_int;
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyGC_IsEnabled")]
pub fn PyGC_IsEnabled() -> c_int; pub fn PyGC_IsEnabled() -> c_int;
} }

5
pyo3-ffi/src/pyerrors.rs
View File

@ -245,6 +245,7 @@ extern "C" {
#[cfg_attr(PyPy, link_name = "PyPyExc_ResourceWarning")] #[cfg_attr(PyPy, link_name = "PyPyExc_ResourceWarning")]
pub static mut PyExc_ResourceWarning: *mut PyObject; pub static mut PyExc_ResourceWarning: *mut PyObject;
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyExc_EncodingWarning")]
pub static mut PyExc_EncodingWarning: *mut PyObject; pub static mut PyExc_EncodingWarning: *mut PyObject;
} }
@ -305,9 +306,13 @@ extern "C" {
#[cfg_attr(PyPy, link_name = "PyPyErr_SetInterrupt")] #[cfg_attr(PyPy, link_name = "PyPyErr_SetInterrupt")]
pub fn PyErr_SetInterrupt(); pub fn PyErr_SetInterrupt();
#[cfg(Py_3_10)] #[cfg(Py_3_10)]
#[cfg_attr(PyPy, link_name = "PyPyErr_SetInterruptEx")]
pub fn PyErr_SetInterruptEx(signum: c_int); pub fn PyErr_SetInterruptEx(signum: c_int);
#[cfg_attr(PyPy, link_name = "PyPyErr_SyntaxLocation")]
pub fn PyErr_SyntaxLocation(filename: *const c_char, lineno: c_int); pub fn PyErr_SyntaxLocation(filename: *const c_char, lineno: c_int);
#[cfg_attr(PyPy, link_name = "PyPyErr_SyntaxLocationEx")]
pub fn PyErr_SyntaxLocationEx(filename: *const c_char, lineno: c_int, col_offset: c_int); pub fn PyErr_SyntaxLocationEx(filename: *const c_char, lineno: c_int, col_offset: c_int);
#[cfg_attr(PyPy, link_name = "PyPyErr_ProgramText")]
pub fn PyErr_ProgramText(filename: *const c_char, lineno: c_int) -> *mut PyObject; pub fn PyErr_ProgramText(filename: *const c_char, lineno: c_int) -> *mut PyObject;
#[cfg(not(PyPy))] #[cfg(not(PyPy))]
pub fn PyUnicodeDecodeError_Create( pub fn PyUnicodeDecodeError_Create(