Use subclass correctly in tp_new #990
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kngwyu
force-pushed
the
tpnew-fix
branch
2 times, most recently
from
3eade55
to
b27f713
Compare
|
This segfault means that our |
davidhewitt
reviewed
Jun 21, 2020
pyo3-derive-backend/src/pymethod.rs
Outdated
| @@ -193,7 +193,7 @@ pub fn impl_wrap_new(cls: &syn::Type, spec: &FnSpec<'_>) -> TokenStream { | |||
| quote! { | |||
| #[allow(unused_mut)] | |||
| unsafe extern "C" fn __wrap( | |||
| _cls: *mut pyo3::ffi::PyTypeObject, | |||
| subcls: *mut pyo3::ffi::PyTypeObject, | |||
There was a problem hiding this comment.
I think it's better to keep the cls name convention maybe.
Suggested change
| subcls: *mut pyo3::ffi::PyTypeObject, | |
| cls: *mut pyo3::ffi::PyTypeObject, |
There was a problem hiding this comment.
Ah yes good find 👍 I think subtype is probably better than cls here and also for create_cell_with_type in that case!
|
Thank you for the reviews 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #947.
As documented, we have to call
subtype->tp_alloc(subtype, nitems)in tp_new.In this PR, I also renamed
PyClassAlloc::alloctonew, since it does not actually overridetp_alloc.