fix FFI definition of PyDictObject on PyPy (#5653)

* fix FFI definition of `PyDictObject` on PyPy

* newsfragments

* don't add additional definitions on PyPy

* cfg gate unused imports

* disable dict inheritance test on graalpy

* another GraalPy fixup

Author: davidhewitt

newsfragments/5653.changed.md

@@ -0,0 +1 @@
+Disable subclassing `PyDict` on GraalPy (unsupported for now).

newsfragments/5653.fixed.md

@@ -0,0 +1 @@
+Fix FFI definition of `PyDictObject` on PyPy.

pyo3-ffi/src/cpython/dictobject.rs

@@ -1,13 +1,17 @@
 use crate::object::*;
+#[cfg(not(PyPy))]
 use crate::pyport::Py_ssize_t;
+#[cfg(not(PyPy))]
 use std::ffi::c_int;
 
+#[cfg(not(PyPy))]
 opaque_struct!(pub PyDictKeysObject);
 
 #[cfg(Py_3_11)]
+#[cfg(not(PyPy))]
 opaque_struct!(pub PyDictValues);
 
-#[cfg(not(GraalPy))]
+#[cfg(not(any(GraalPy, PyPy)))]
 #[repr(C)]
 #[derive(Debug)]
 pub struct PyDictObject {
@@ -28,11 +32,20 @@ pub struct PyDictObject {
     pub ma_values: *mut PyDictValues,
 }
 
+#[cfg(PyPy)]
+#[repr(C)]
+#[derive(Debug)]
+pub struct PyDictObject {
+    pub ob_base: PyObject,
+    _tmpkeys: *mut PyObject,
+}
+
 extern "C" {
     // skipped _PyDict_GetItem_KnownHash
     // skipped _PyDict_GetItemIdWithError
     // skipped _PyDict_GetItemStringWithError
     // skipped PyDict_SetDefault
+    #[cfg(not(PyPy))]
     pub fn _PyDict_SetItem_KnownHash(
         mp: *mut PyObject,
         key: *mut PyObject,
@@ -42,6 +55,7 @@ extern "C" {
     // skipped _PyDict_DelItem_KnownHash
     // skipped _PyDict_DelItemIf
     // skipped _PyDict_NewKeysForClass
+    #[cfg(not(PyPy))]
     pub fn _PyDict_Next(
         mp: *mut PyObject,
         pos: *mut Py_ssize_t,
@@ -51,6 +65,7 @@ extern "C" {
     ) -> c_int;
     // skipped PyDict_GET_SIZE
     // skipped _PyDict_ContainsId
+    #[cfg(not(PyPy))]
     pub fn _PyDict_NewPresized(minused: Py_ssize_t) -> *mut PyObject;
     // skipped _PyDict_MaybeUntrack
     // skipped _PyDict_HasOnlyStringKeys
@@ -72,12 +87,14 @@ extern "C" {
     // skipped _PyDictView_Intersect
 
     #[cfg(Py_3_10)]
+    #[cfg(not(PyPy))]
     pub fn _PyDict_Contains_KnownHash(
         op: *mut PyObject,
         key: *mut PyObject,
         hash: crate::Py_hash_t,
     ) -> c_int;
 
     #[cfg(not(Py_3_10))]
+    #[cfg(not(PyPy))]
     pub fn _PyDict_Contains(mp: *mut PyObject, key: *mut PyObject, hash: Py_ssize_t) -> c_int;
 }

pyo3-ffi/src/cpython/mod.rs

@@ -9,7 +9,6 @@ pub(crate) mod complexobject;
 #[cfg(Py_3_13)]
 pub(crate) mod critical_section;
 pub(crate) mod descrobject;
-#[cfg(not(PyPy))]
 pub(crate) mod dictobject;
 // skipped fileobject.h
 // skipped fileutils.h
@@ -53,7 +52,6 @@ pub use self::complexobject::*;
 #[cfg(Py_3_13)]
 pub use self::critical_section::*;
 pub use self::descrobject::*;
-#[cfg(not(PyPy))]
 pub use self::dictobject::*;
 pub use self::floatobject::*;
 pub use self::frameobject::*;

pyo3-ffi/src/dictobject.rs

@@ -116,6 +116,6 @@ extern "C" {
     pub static mut PyDictRevIterItem_Type: PyTypeObject;
 }
 
-#[cfg(any(PyPy, GraalPy, Py_LIMITED_API))]
+#[cfg(any(GraalPy, Py_LIMITED_API))]
 // TODO: remove (see https://github.com/PyO3/pyo3/pull/1341#issuecomment-751515985)
 opaque_struct!(pub PyDictObject);

src/types/dict.rs

@@ -16,6 +16,7 @@ use crate::{ffi, BoundObject, IntoPyObject, IntoPyObjectExt, Python};
 #[repr(transparent)]
 pub struct PyDict(PyAny);
 
+#[cfg(not(GraalPy))]
 pyobject_subclassable_native_type!(PyDict, crate::ffi::PyDictObject);
 
 pyobject_native_type!(

tests/test_inheritance.rs

@@ -177,6 +177,7 @@ except Exception as e:
 mod inheriting_native_type {
     use super::*;
     use pyo3::exceptions::PyException;
+    #[cfg(not(GraalPy))]
     use pyo3::types::PyDict;
 
     #[cfg(not(any(PyPy, GraalPy)))]
@@ -209,13 +210,15 @@ mod inheriting_native_type {
         });
     }
 
+    #[cfg(not(GraalPy))]
     #[pyclass(extends=PyDict)]
     #[derive(Debug)]
     struct DictWithName {
         #[pyo3(get, name = "name")]
         _name: &'static str,
     }
 
+    #[cfg(not(GraalPy))]
     #[pymethods]
     impl DictWithName {
         #[new]
@@ -224,6 +227,7 @@ mod inheriting_native_type {
         }
     }
 
+    #[cfg(not(GraalPy))]
     #[test]
     fn inherit_dict() {
         Python::attach(|py| {
@@ -236,6 +240,7 @@ mod inheriting_native_type {
         });
     }
 
+    #[cfg(not(GraalPy))]
     #[test]
     fn inherit_dict_drop() {
         Python::attach(|py| {