bpo-44562: Use PyType_GenericAlloc in Py_GenericAlias #27021
Merged
Conversation
This file contains hidden or 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
| @@ -646,11 +646,11 @@ PyTypeObject Py_GenericAliasType = { | |||
| PyObject * | |||
| Py_GenericAlias(PyObject *origin, PyObject *args) | |||
| { | |||
| gaobject *alias = PyObject_GC_New(gaobject, &Py_GenericAliasType); | |||
| gaobject *alias = (gaobject*) PyType_GenericAlloc( | |||
There was a problem hiding this comment.
PyType_GenericAlloc() calls _PyObject_GC_Malloc() instead of PyObject_GC_New().
There was a problem hiding this comment.
_PyObject_GC_New calls _PyObject_GC_Malloc + _PyObject_Init, which PyType_GenericAlloc also calls. What I am missing?
There was a problem hiding this comment.
All right then.
Please fix also ga_new().
There was a problem hiding this comment.
ga_new doesn't seem to need the fix. It uses tp_alloc which is set to PyType_GenericAlloc .
| @@ -646,11 +646,11 @@ PyTypeObject Py_GenericAliasType = { | |||
| PyObject * | |||
| Py_GenericAlias(PyObject *origin, PyObject *args) | |||
| { | |||
| gaobject *alias = PyObject_GC_New(gaobject, &Py_GenericAliasType); | |||
| gaobject *alias = (gaobject*) PyType_GenericAlloc( | |||
There was a problem hiding this comment.
All right then.
Please fix also ga_new().
serhiy-storchaka
approved these changes
Jul 5, 2021
Co-authored-by: Serhiy Storchaka <[email protected]>
|
Thanks @pablogsal for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10. |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Jul 5, 2021
* bpo-44562: Use PyType_GenericAlloc in Py_GenericAlias * Update Objects/genericaliasobject.c Co-authored-by: Serhiy Storchaka <[email protected]> Co-authored-by: Serhiy Storchaka <[email protected]> (cherry picked from commit b324c4c) Co-authored-by: Pablo Galindo <[email protected]>
|
GH-27031 is a backport of this pull request to the 3.10 branch. |
miss-islington
added a commit
that referenced
this pull request
Jul 5, 2021
* bpo-44562: Use PyType_GenericAlloc in Py_GenericAlias * Update Objects/genericaliasobject.c Co-authored-by: Serhiy Storchaka <[email protected]> Co-authored-by: Serhiy Storchaka <[email protected]> (cherry picked from commit b324c4c) Co-authored-by: Pablo Galindo <[email protected]>
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.
https://bugs.python.org/issue44562