https://github.com/python/cpython/commit/1588413ca7755a38aae40d25b2d24e813fca6feb
commit: 1588413ca7755a38aae40d25b2d24e813fca6feb
branch: main
author: Sergey Miryanov <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2025-10-01T13:15:58+05:30
summary:
gh-116946: remove unnecessary gc from immutable types (#139073)
files:
M Modules/_bz2module.c
M Modules/_lzmamodule.c
M Modules/_ssl.c
M Modules/_threadmodule.c
M Modules/hmacmodule.c
diff --git a/Modules/_bz2module.c b/Modules/_bz2module.c
index ea94f4321d74de..2e4cc43a2c3f11 100644
--- a/Modules/_bz2module.c
+++ b/Modules/_bz2module.c
@@ -391,13 +391,6 @@ BZ2Compressor_dealloc(PyObject *op)
Py_DECREF(tp);
}
-static int
-BZ2Compressor_traverse(PyObject *self, visitproc visit, void *arg)
-{
- Py_VISIT(Py_TYPE(self));
- return 0;
-}
-
static PyMethodDef BZ2Compressor_methods[] = {
_BZ2_BZ2COMPRESSOR_COMPRESS_METHODDEF
_BZ2_BZ2COMPRESSOR_FLUSH_METHODDEF
@@ -409,7 +402,6 @@ static PyType_Slot bz2_compressor_type_slots[] = {
{Py_tp_methods, BZ2Compressor_methods},
{Py_tp_new, _bz2_BZ2Compressor},
{Py_tp_doc, (char *)_bz2_BZ2Compressor__doc__},
- {Py_tp_traverse, BZ2Compressor_traverse},
{0, 0}
};
@@ -701,13 +693,6 @@ BZ2Decompressor_dealloc(PyObject *op)
Py_DECREF(tp);
}
-static int
-BZ2Decompressor_traverse(PyObject *self, visitproc visit, void *arg)
-{
- Py_VISIT(Py_TYPE(self));
- return 0;
-}
-
static PyMethodDef BZ2Decompressor_methods[] = {
_BZ2_BZ2DECOMPRESSOR_DECOMPRESS_METHODDEF
{NULL}
@@ -738,7 +723,6 @@ static PyType_Slot bz2_decompressor_type_slots[] = {
{Py_tp_doc, (char *)_bz2_BZ2Decompressor__doc__},
{Py_tp_members, BZ2Decompressor_members},
{Py_tp_new, _bz2_BZ2Decompressor},
- {Py_tp_traverse, BZ2Decompressor_traverse},
{0, 0}
};
diff --git a/Modules/_lzmamodule.c b/Modules/_lzmamodule.c
index bac49b1268cc56..3e8e37096ba6b4 100644
--- a/Modules/_lzmamodule.c
+++ b/Modules/_lzmamodule.c
@@ -882,13 +882,6 @@ static PyMethodDef Compressor_methods[] = {
{NULL}
};
-static int
-Compressor_traverse(PyObject *self, visitproc visit, void *arg)
-{
- Py_VISIT(Py_TYPE(self));
- return 0;
-}
-
PyDoc_STRVAR(Compressor_doc,
"LZMACompressor(format=FORMAT_XZ, check=-1, preset=None, filters=None)\n"
"\n"
@@ -922,7 +915,6 @@ static PyType_Slot lzma_compressor_type_slots[] = {
{Py_tp_methods, Compressor_methods},
{Py_tp_new, Compressor_new},
{Py_tp_doc, (char *)Compressor_doc},
- {Py_tp_traverse, Compressor_traverse},
{0, 0}
};
@@ -1325,13 +1317,6 @@ Decompressor_dealloc(PyObject *op)
Py_DECREF(tp);
}
-static int
-Decompressor_traverse(PyObject *self, visitproc visit, void *arg)
-{
- Py_VISIT(Py_TYPE(self));
- return 0;
-}
-
static PyMethodDef Decompressor_methods[] = {
_LZMA_LZMADECOMPRESSOR_DECOMPRESS_METHODDEF
{NULL}
@@ -1366,7 +1351,6 @@ static PyType_Slot lzma_decompressor_type_slots[] = {
{Py_tp_methods, Decompressor_methods},
{Py_tp_new, _lzma_LZMADecompressor},
{Py_tp_doc, (char *)_lzma_LZMADecompressor__doc__},
- {Py_tp_traverse, Decompressor_traverse},
{Py_tp_members, Decompressor_members},
{0, 0}
};
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 0731c48b460105..5d075fe942b205 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -5793,7 +5793,6 @@ memory_bio_dealloc(PyObject *op)
{
PySSLMemoryBIO *self = PySSLMemoryBIO_CAST(op);
PyTypeObject *tp = Py_TYPE(self);
- PyObject_GC_UnTrack(self);
(void)BIO_free(self->bio);
tp->tp_free(self);
Py_DECREF(tp);
@@ -5957,15 +5956,13 @@ static PyType_Slot PySSLMemoryBIO_slots[] = {
{Py_tp_getset, memory_bio_getsetlist},
{Py_tp_new, _ssl_MemoryBIO},
{Py_tp_dealloc, memory_bio_dealloc},
- {Py_tp_traverse, _PyObject_VisitType},
{0, 0},
};
static PyType_Spec PySSLMemoryBIO_spec = {
.name = "_ssl.MemoryBIO",
.basicsize = sizeof(PySSLMemoryBIO),
- .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE |
- Py_TPFLAGS_HAVE_GC),
+ .flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE),
.slots = PySSLMemoryBIO_slots,
};
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index cc8277c5783858..b43bf5e97d81a6 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -660,7 +660,6 @@ static void
PyThreadHandleObject_dealloc(PyObject *op)
{
PyThreadHandleObject *self = PyThreadHandleObject_CAST(op);
- PyObject_GC_UnTrack(self);
PyTypeObject *tp = Py_TYPE(self);
ThreadHandle_decref(self->handle);
tp->tp_free(self);
@@ -748,7 +747,6 @@ static PyType_Slot ThreadHandle_Type_slots[] = {
{Py_tp_dealloc, PyThreadHandleObject_dealloc},
{Py_tp_repr, PyThreadHandleObject_repr},
{Py_tp_getset, ThreadHandle_getsetlist},
- {Py_tp_traverse, _PyObject_VisitType},
{Py_tp_methods, ThreadHandle_methods},
{Py_tp_new, PyThreadHandleObject_tp_new},
{0, 0}
@@ -758,7 +756,7 @@ static PyType_Spec ThreadHandle_Type_spec = {
"_thread._ThreadHandle",
sizeof(PyThreadHandleObject),
0,
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC,
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE,
ThreadHandle_Type_slots,
};
diff --git a/Modules/hmacmodule.c b/Modules/hmacmodule.c
index b30dda501a0716..f074f24807703c 100644
--- a/Modules/hmacmodule.c
+++ b/Modules/hmacmodule.c
@@ -756,7 +756,7 @@ _hmac_new_impl(PyObject *module, PyObject *keyobj, PyObject
*msgobj,
return NULL;
}
- HMACObject *self = PyObject_GC_New(HMACObject, state->hmac_type);
+ HMACObject *self = PyObject_New(HMACObject, state->hmac_type);
if (self == NULL) {
return NULL;
}
@@ -791,7 +791,6 @@ _hmac_new_impl(PyObject *module, PyObject *keyobj, PyObject
*msgobj,
#endif
}
assert(rc == 0);
- PyObject_GC_Track(self);
return (PyObject *)self;
error_on_key:
@@ -852,7 +851,7 @@ _hmac_HMAC_copy_impl(HMACObject *self, PyTypeObject *cls)
/*[clinic end generated code: output=a955bfa55b65b215 input=17b2c0ad0b147e36]*/
{
hmacmodule_state *state = get_hmacmodule_state_by_cls(cls);
- HMACObject *copy = PyObject_GC_New(HMACObject, state->hmac_type);
+ HMACObject *copy = PyObject_New(HMACObject, state->hmac_type);
if (copy == NULL) {
return NULL;
}
@@ -870,7 +869,6 @@ _hmac_HMAC_copy_impl(HMACObject *self, PyTypeObject *cls)
}
HASHLIB_INIT_MUTEX(copy);
- PyObject_GC_Track(copy);
return (PyObject *)copy;
}
@@ -1026,7 +1024,6 @@ static void
HMACObject_dealloc(PyObject *op)
{
PyTypeObject *type = Py_TYPE(op);
- PyObject_GC_UnTrack(op);
(void)HMACObject_clear(op);
type->tp_free(op);
Py_DECREF(type);
@@ -1051,9 +1048,7 @@ static PyType_Slot HMACObject_Type_slots[] = {
{Py_tp_repr, HMACObject_repr},
{Py_tp_methods, HMACObject_methods},
{Py_tp_getset, HMACObject_getsets},
- {Py_tp_clear, HMACObject_clear},
{Py_tp_dealloc, HMACObject_dealloc},
- {Py_tp_traverse, _PyObject_VisitType},
{0, NULL} /* sentinel */
};
@@ -1063,8 +1058,7 @@ static PyType_Spec HMAC_Type_spec = {
.flags = Py_TPFLAGS_DEFAULT
| Py_TPFLAGS_DISALLOW_INSTANTIATION
| Py_TPFLAGS_HEAPTYPE
- | Py_TPFLAGS_IMMUTABLETYPE
- | Py_TPFLAGS_HAVE_GC,
+ | Py_TPFLAGS_IMMUTABLETYPE,
.slots = HMACObject_Type_slots,
};
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
