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

Fix `_PyFrameEvalFunction` receives an `_PyInterpreterFrame` since Python 3.11

newsfragments/3500.fixed.md

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

pyo3-ffi/src/cpython/ceval.rs

@@ -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);

pyo3-ffi/src/cpython/mod.rs

@@ -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::*;

pyo3-ffi/src/cpython/pyframe.rs

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

pyo3-ffi/src/cpython/pystate.rs

@@ -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.