https://github.com/python/cpython/commit/efa738e862da26f870ca659b01ff732649f400a7
commit: efa738e862da26f870ca659b01ff732649f400a7
branch: main
author: Donghee Na <[email protected]>
committer: corona10 <[email protected]>
date: 2024-01-12T00:31:28Z
summary:
gh-111968: Explicit handling for finalized freelist (gh-113929)
files:
M Objects/floatobject.c
M Objects/listobject.c
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
index f1a09c0a94f4a6..912c450a5e1055 100644
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -132,10 +132,6 @@ PyFloat_FromDouble(double fval)
struct _Py_float_state *state = get_float_state();
op = state->free_list;
if (op != NULL) {
-#ifdef Py_DEBUG
- // PyFloat_FromDouble() must not be called after _PyFloat_Fini()
- assert(state->numfree != -1);
-#endif
state->free_list = (PyFloatObject *) Py_TYPE(op);
state->numfree--;
OBJECT_STAT_INC(from_freelist);
diff --git a/Objects/listobject.c b/Objects/listobject.c
index c05c4fdff83883..288c704be9842a 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -20,7 +20,7 @@ class list "PyListObject *" "&PyList_Type"
_Py_DECLARE_STR(list_err, "list index out of range");
-#if PyList_MAXFREELIST > 0
+#ifdef WITH_FREELISTS
static struct _Py_list_state *
get_list_state(void)
{
@@ -123,7 +123,7 @@ list_preallocate_exact(PyListObject *self, Py_ssize_t size)
void
_PyList_ClearFreeList(_PyFreeListState *freelist_state, int is_finalization)
{
-#if PyList_MAXFREELIST > 0
+#ifdef WITH_FREELISTS
struct _Py_list_state *state = &freelist_state->list_state;
while (state->numfree > 0) {
PyListObject *op = state->free_list[--state->numfree];
@@ -146,7 +146,7 @@ _PyList_Fini(_PyFreeListState *state)
void
_PyList_DebugMallocStats(FILE *out)
{
-#if PyList_MAXFREELIST > 0
+#ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state();
_PyDebugAllocatorStats(out,
"free PyListObject",
@@ -164,13 +164,9 @@ PyList_New(Py_ssize_t size)
return NULL;
}
-#if PyList_MAXFREELIST > 0
+#ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state();
-#ifdef Py_DEBUG
- // PyList_New() must not be called after _PyList_Fini()
- assert(state->numfree != -1);
-#endif
- if (PyList_MAXFREELIST && state->numfree) {
+ if (PyList_MAXFREELIST && state->numfree > 0) {
state->numfree--;
op = state->free_list[state->numfree];
OBJECT_STAT_INC(from_freelist);
@@ -360,13 +356,9 @@ list_dealloc(PyObject *self)
}
PyMem_Free(op->ob_item);
}
-#if PyList_MAXFREELIST > 0
+#ifdef WITH_FREELISTS
struct _Py_list_state *state = get_list_state();
-#ifdef Py_DEBUG
- // list_dealloc() must not be called after _PyList_Fini()
- assert(state->numfree != -1);
-#endif
- if (state->numfree < PyList_MAXFREELIST && PyList_CheckExact(op)) {
+ if (state->numfree < PyList_MAXFREELIST && state->numfree >= 0 &&
PyList_CheckExact(op)) {
state->free_list[state->numfree++] = op;
OBJECT_STAT_INC(to_freelist);
}
_______________________________________________
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]
