Skip to content

gh-91632: Fix generic_alias_iterator to be finalized at exit. #91727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 20, 2022
Merged

gh-91632: Fix generic_alias_iterator to be finalized at exit. #91727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdd6a58
Fix Py_GenericAliasIterType to be finalized at exit.
corona10 Apr 20, 2022
d60df13
Address Victor's review
corona10 Apr 20, 2022
55d04c4
Update Misc/NEWS.d/next/Core and Builtins/2022-04-20-14-43-37.gh-issu…
corona10 Apr 20, 2022
a9a938c
Address code review
corona10 Apr 20, 2022
9b3dbd0
fix comment style
corona10 Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-04-20-14-43-37.gh-issue-91632.cvUhsZ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a minor memory leak at exit: release the memory of the :class:`generic_alias_iterator` type. Patch by Dong-hee Na.
6 changes: 4 additions & 2 deletions Objects/genericaliasobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,9 @@ ga_iter_clear(PyObject *self) {
return 0;
}

static PyTypeObject Py_GenericAliasIterType = {
// gh-91632: _Py_GenericAliasIterType is exported to be cleared
// in _PyTypes_FiniTypes.
PyTypeObject _Py_GenericAliasIterType = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
.tp_name = "generic_alias_iterator",
.tp_basicsize = sizeof(gaiterobject),
Expand All @@ -697,7 +699,7 @@ static PyTypeObject Py_GenericAliasIterType = {

static PyObject *
ga_iter(PyObject *self) {
gaiterobject *gi = PyObject_GC_New(gaiterobject, &Py_GenericAliasIterType);
gaiterobject *gi = PyObject_GC_New(gaiterobject, &_Py_GenericAliasIterType);
if (gi == NULL) {
return NULL;
}
Expand Down
2 changes: 2 additions & 0 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1834,6 +1834,7 @@ _PyTypes_InitState(PyInterpreterState *interp)
#ifdef MS_WINDOWS
extern PyTypeObject PyHKEY_Type;
#endif
extern PyTypeObject _Py_GenericAliasIterType;

static PyTypeObject* static_types[] = {
// The two most important base types: must be initialized first and
Expand Down Expand Up @@ -1923,6 +1924,7 @@ static PyTypeObject* static_types[] = {
&_PyAsyncGenWrappedValue_Type,
&_PyContextTokenMissing_Type,
&_PyCoroWrapper_Type,
&_Py_GenericAliasIterType,
&_PyHamtItems_Type,
&_PyHamtKeys_Type,
&_PyHamtValues_Type,
Expand Down