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

Merge #2895 

2895: tidy up implementation of pyclass `tp_dealloc` r=adamreichold a=davidhewitt

Just carries out a TODO to remove one level from the call stack. No external-facing changes.

Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-01-19 21:48:41 +00:00 committed by GitHub
parent dbb108c2c5 255d9bacce
commit 4d8537499f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/impl_/pyclass.rs
View File

@ -928,14 +928,7 @@ impl<T: PyClass> PyClassBaseType for T {
/// Implementation of tp_dealloc for all pyclasses
pub(crate) unsafe extern "C" fn tp_dealloc<T: PyClass>(obj: *mut ffi::PyObject) {
/// A wrapper because PyCellLayout::tp_dealloc currently takes the py argument last
/// (which is different to the rest of the trampolines which take py first)
#[inline]
unsafe fn trampoline_dealloc_wrapper<T: PyClass>(py: Python<'_>, slf: *mut ffi::PyObject) {
T::Layout::tp_dealloc(slf, py);
}
// TODO change argument order in PyCellLayout::tp_dealloc so this wrapper isn't needed.
crate::impl_::trampoline::dealloc(obj, trampoline_dealloc_wrapper::<T>)
crate::impl_::trampoline::dealloc(obj, T::Layout::tp_dealloc)
}
pub(crate) unsafe extern "C" fn get_sequence_item_from_mapping(

8
src/pycell.rs
View File

@ -854,7 +854,7 @@ pub trait PyCellLayout<T>: PyLayout<T> {
/// # Safety
/// - slf must be a valid pointer to an instance of a T or a subclass.
/// - slf must not be used after this call (as it will be freed).
unsafe fn tp_dealloc(slf: *mut ffi::PyObject, py: Python<'_>);
unsafe fn tp_dealloc(py: Python<'_>, slf: *mut ffi::PyObject);
}
impl<T, U> PyCellLayout<T> for PyCellBase<U>
@ -863,7 +863,7 @@ where
T: PyTypeInfo,
{
fn ensure_threadsafe(&self) {}
unsafe fn tp_dealloc(slf: *mut ffi::PyObject, py: Python<'_>) {
unsafe fn tp_dealloc(py: Python<'_>, slf: *mut ffi::PyObject) {
// For `#[pyclass]` types which inherit from PyAny, we can just call tp_free
if T::type_object_raw(py) == &mut PyBaseObject_Type {
return get_tp_free(ffi::Py_TYPE(slf))(slf as _);
@ -892,13 +892,13 @@ where
self.contents.thread_checker.ensure();
self.ob_base.ensure_threadsafe();
}
unsafe fn tp_dealloc(slf: *mut ffi::PyObject, py: Python<'_>) {
unsafe fn tp_dealloc(py: Python<'_>, slf: *mut ffi::PyObject) {
// Safety: Python only calls tp_dealloc when no references to the object remain.
let cell = &mut *(slf as *mut PyCell<T>);
ManuallyDrop::drop(&mut cell.contents.value);
cell.contents.dict.clear_dict(py);
cell.contents.weakref.clear_weakrefs(slf, py);
<T::BaseType as PyClassBaseType>::LayoutAsBase::tp_dealloc(slf, py)
<T::BaseType as PyClassBaseType>::LayoutAsBase::tp_dealloc(py, slf)
}
}