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

Merge pull request #3500 from ecarrara/fix-eval-frame-py311 

Fix `_PyFrameEvalFunction` receives an `_PyInterpreterFrame` since Python 3.11
This commit is contained in:
David Hewitt 2023-10-10 05:35:21 +00:00 committed by GitHub
parent 300f2d63ae 0e0e6623f3
commit 80bbb30f56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
newsfragments/3500.fixed.md Normal file
View File

@ -0,0 +1,2 @@
In Python 3.11 the `_PyFrameEvalFunction` receives a `_PyInterpreterFrame` opaque struct.

9
pyo3-ffi/src/cpython/ceval.rs
View File

@ -5,7 +5,16 @@ use std::os::raw::c_int;
extern "C" {
// skipped non-limited _PyEval_CallTracing
#[cfg(not(Py_3_11))]
pub fn _PyEval_EvalFrameDefault(arg1: *mut crate::PyFrameObject, exc: c_int) -> *mut PyObject;
#[cfg(Py_3_11)]
pub fn _PyEval_EvalFrameDefault(
tstate: *mut crate::PyThreadState,
frame: *mut crate::_PyInterpreterFrame,
exc: c_int,
) -> *mut crate::PyObject;
pub fn _PyEval_RequestCodeExtraIndex(func: freefunc) -> c_int;
pub fn PyEval_SetProfile(trace_func: Option<Py_tracefunc>, arg1: *mut PyObject);
pub fn PyEval_SetTrace(trace_func: Option<Py_tracefunc>, arg1: *mut PyObject);

4
pyo3-ffi/src/cpython/mod.rs
View File

@ -31,6 +31,8 @@ pub(crate) mod pystate;
pub(crate) mod pythonrun;
// skipped sysmodule.h
pub(crate) mod floatobject;
#[cfg(not(PyPy))]
pub(crate) mod pyframe;
pub(crate) mod tupleobject;
pub(crate) mod unicodeobject;
pub(crate) mod weakrefobject;
@ -58,6 +60,8 @@ pub use self::object::*;
pub use self::objimpl::*;
pub use self::pydebug::*;
pub use self::pyerrors::*;
#[cfg(not(PyPy))]
pub use self::pyframe::*;
#[cfg(all(Py_3_8, not(PyPy)))]
pub use self::pylifecycle::*;
pub use self::pymem::*;

2
pyo3-ffi/src/cpython/pyframe.rs Normal file
View File

@ -0,0 +1,2 @@
#[cfg(Py_3_11)]
opaque_struct!(_PyInterpreterFrame);

9
pyo3-ffi/src/cpython/pystate.rs
View File

@ -69,13 +69,20 @@ extern "C" {
pub fn PyThreadState_DeleteCurrent();
}
#[cfg(Py_3_9)]
#[cfg(all(Py_3_9, not(Py_3_11)))]
pub type _PyFrameEvalFunction = extern "C" fn(
*mut crate::PyThreadState,
*mut crate::PyFrameObject,
c_int,
) -> *mut crate::object::PyObject;
#[cfg(Py_3_11)]
pub type _PyFrameEvalFunction = extern "C" fn(
*mut crate::PyThreadState,
*mut crate::_PyInterpreterFrame,
c_int,
) -> *mut crate::object::PyObject;
#[cfg(Py_3_9)]
extern "C" {
/// Get the frame evaluation function.