Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-111968: Fix --without-freelists build (gh-114270)

This commit is contained in:
Donghee Na 2024-01-19 08:25:13 +09:00 committed by GitHub
parent d5442851a6
commit a34e4db28a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Objects/sliceobject.c
View File

@ -105,16 +105,20 @@ PyObject _Py_EllipsisObject = _PyObject_HEAD_INIT(&PyEllipsis_Type);
void _PySlice_ClearCache(_PyFreeListState *state) void _PySlice_ClearCache(_PyFreeListState *state)
{ {
#ifdef WITH_FREELISTS
PySliceObject *obj = state->slice_state.slice_cache; PySliceObject *obj = state->slice_state.slice_cache;
if (obj != NULL) { if (obj != NULL) {
state->slice_state.slice_cache = NULL; state->slice_state.slice_cache = NULL;
PyObject_GC_Del(obj); PyObject_GC_Del(obj);
} }
#endif
} }
void _PySlice_Fini(_PyFreeListState *state) void _PySlice_Fini(_PyFreeListState *state)
{ {
#ifdef WITH_FREELISTS
_PySlice_ClearCache(state); _PySlice_ClearCache(state);
#endif
} }
/* start, stop, and step are python objects with None indicating no /* start, stop, and step are python objects with None indicating no
@ -125,15 +129,17 @@ static PySliceObject *
_PyBuildSlice_Consume2(PyObject *start, PyObject *stop, PyObject *step) _PyBuildSlice_Consume2(PyObject *start, PyObject *stop, PyObject *step)
{ {
assert(start != NULL && stop != NULL && step != NULL); assert(start != NULL && stop != NULL && step != NULL);
_PyFreeListState *state = _PyFreeListState_GET();
PySliceObject *obj; PySliceObject *obj;
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache != NULL) { if (state->slice_state.slice_cache != NULL) {
obj = state->slice_state.slice_cache; obj = state->slice_state.slice_cache;
state->slice_state.slice_cache = NULL; state->slice_state.slice_cache = NULL;
_Py_NewReference((PyObject *)obj); _Py_NewReference((PyObject *)obj);
} }
else { else
#endif
{
obj = PyObject_GC_New(PySliceObject, &PySlice_Type); obj = PyObject_GC_New(PySliceObject, &PySlice_Type);
if (obj == NULL) { if (obj == NULL) {
goto error; goto error;
@ -358,15 +364,18 @@ Create a slice object. This is used for extended slicing (e.g. a[0:10:2]).");
static void static void
slice_dealloc(PySliceObject *r) slice_dealloc(PySliceObject *r)
{ {
_PyFreeListState *state = _PyFreeListState_GET();
_PyObject_GC_UNTRACK(r); _PyObject_GC_UNTRACK(r);
Py_DECREF(r->step); Py_DECREF(r->step);
Py_DECREF(r->start); Py_DECREF(r->start);
Py_DECREF(r->stop); Py_DECREF(r->stop);
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache == NULL) { if (state->slice_state.slice_cache == NULL) {
state->slice_state.slice_cache = r; state->slice_state.slice_cache = r;
} }
else { else
#endif
{
PyObject_GC_Del(r); PyObject_GC_Del(r);
} }
} }