bpo-37879: Fix warnings in _testcapimodule #16004
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
corona10
requested changes
Sep 12, 2019
Modules/_testcapimodule.c
Outdated
| @@ -6303,7 +6303,8 @@ heapctypesubclasswithfinalizer_init(PyObject *self, PyObject *args, PyObject *kw | |||
| static void | |||
| heapctypesubclasswithfinalizer_finalize(PyObject *self) | |||
| { | |||
| PyObject *error_type, *error_value, *error_traceback, *m, *oldtype, *newtype; | |||
| PyObject *error_type, *error_value, *error_traceback, *m; | |||
| PyObject *oldtype=NULL, *newtype=NULL; | |||
There was a problem hiding this comment.
nit
PyObject *oldtype = NULL, *newtype = NULL;Always put spaces around assignment, Boolean and comparison operators.
from PEP7 :)
corona10
reviewed
Sep 12, 2019
| @@ -6233,7 +6233,7 @@ static PyType_Slot HeapCType_slots[] = { | |||
| {Py_tp_init, heapctype_init}, | |||
| {Py_tp_members, heapctype_members}, | |||
| {Py_tp_dealloc, heapctype_dealloc}, | |||
| {Py_tp_doc, heapctype__doc__}, | |||
| {Py_tp_doc, (char*)heapctype__doc__}, | |||
There was a problem hiding this comment.
Line 2048 in 2ec7010
There are some cases that handling type casting with Py_tp_doc
They are using void*. How about casting to void*?
There was a problem hiding this comment.
Either will work.
Ideally we'd want all the slots to be const, but some of them are PyObjects with mutable refcounts :(
corona10
approved these changes
Sep 12, 2019
|
Thanks for the review! |
encukou
added a commit
that referenced
this pull request
Sep 12, 2019
…C heap type (GH-15323, GH-16004) (GH-15966) The instance destructor for a type is responsible for preparing an instance for deallocation by decrementing the reference counts of its referents. If an instance belongs to a heap type, the type object of an instance has its reference count decremented while for static types, which are permanently allocated, the type object is unaffected by the instance destructor. Previously, the default instance destructor searched the class hierarchy for an inherited instance destructor and, if present, would invoke it. Then, if the instance type is a heap type, it would decrement the reference count of that heap type. However, this could result in the premature destruction of a type because the inherited instance destructor should have already decremented the reference count of the type object. This change avoids the premature destruction of the type object by suppressing the decrement of its reference count when an inherited, non-default instance destructor has been invoked. Finally, an assertion on the Py_SIZE of a type was deleted. Heap types have a non zero size, making this into an incorrect assertion. #15323. (cherry picked from commit ff023ed) Fixup: #16004. (cherry picked from commit 5e9caee) Co-authored-by: Eddie Elizondo <eduardo.elizondorueda@gmail.com>
DinoV
pushed a commit
to DinoV/cpython
that referenced
this pull request
Sep 12, 2019
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.
Commit ff023ed introduced some warnings that got through my review. Here is a fix.
https://bugs.python.org/issue37879