[3.13] gh-123448: Move _PyNoDefault_Type to the static types array (GH-123449) (#123450)

miss-islington · ZeroIntensity · web-flow · commit bd29ce850907 · 2024-08-28T18:57:28.000-07:00
(cherry picked from commit c9930f5) Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
diff --git a/Misc/NEWS.d/next/Library/2024-08-28-20-08-19.gh-issue-123448.tItJlp.rst b/Misc/NEWS.d/next/Library/2024-08-28-20-08-19.gh-issue-123448.tItJlp.rst
@@ -0,0 +1,2 @@
+Fixed memory leak of :class:`typing.NoDefault` by moving it to the static types
+array.
diff --git a/Modules/_typingmodule.c b/Modules/_typingmodule.c
@@ -63,9 +63,6 @@ _typing_exec(PyObject *m)
     if (PyModule_AddObjectRef(m, "TypeAliasType", (PyObject *)&_PyTypeAlias_Type) < 0) {
         return -1;
     }
-    if (PyType_Ready(&_PyNoDefault_Type) < 0) {
-        return -1;
-    }
     if (PyModule_AddObjectRef(m, "NoDefault", (PyObject *)&_Py_NoDefaultStruct) < 0) {
         return -1;
     }
diff --git a/Objects/object.c b/Objects/object.c
@@ -2324,6 +2324,7 @@ static PyTypeObject* static_types[] = {
     &_PyWeakref_ProxyType,
     &_PyWeakref_RefType,
     &_PyTypeAlias_Type,
+    &_PyNoDefault_Type,
 
     // subclasses: _PyTypes_FiniTypes() deallocates them before their base
     // class

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fixed memory leak of :class:`typing.NoDefault` by moving it to the static types
	`2`	`+array.`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ _typing_exec(PyObject *m)`
`63`	`63`	`if (PyModule_AddObjectRef(m, "TypeAliasType", (PyObject *)&_PyTypeAlias_Type) < 0) {`
`64`	`64`	`return -1;`
`65`	`65`	`}`
`66`		`- if (PyType_Ready(&_PyNoDefault_Type) < 0) {`
`67`		`- return -1;`
`68`		`- }`
`69`	`66`	`if (PyModule_AddObjectRef(m, "NoDefault", (PyObject *)&_Py_NoDefaultStruct) < 0) {`
`70`	`67`	`return -1;`
`71`	`68`	`}`