Skip to content

Commit

Permalink
pythongh-111968: Fix --without-freelists build (pythongh-114270)
Browse files Browse the repository at this point in the history
  • Loading branch information
corona10 authored and kulikjak committed Jan 22, 2024
1 parent 4ac00ec commit 36d338f
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions Objects/sliceobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,20 @@ PyObject _Py_EllipsisObject = _PyObject_HEAD_INIT(&PyEllipsis_Type);

void _PySlice_ClearCache(_PyFreeListState *state)
{
#ifdef WITH_FREELISTS
PySliceObject *obj = state->slice_state.slice_cache;
if (obj != NULL) {
state->slice_state.slice_cache = NULL;
PyObject_GC_Del(obj);
}
#endif
}

void _PySlice_Fini(_PyFreeListState *state)
{
#ifdef WITH_FREELISTS
_PySlice_ClearCache(state);
#endif
}

/* start, stop, and step are python objects with None indicating no
Expand All @@ -125,15 +129,17 @@ static PySliceObject *
_PyBuildSlice_Consume2(PyObject *start, PyObject *stop, PyObject *step)
{
assert(start != NULL && stop != NULL && step != NULL);

_PyFreeListState *state = _PyFreeListState_GET();
PySliceObject *obj;
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache != NULL) {
obj = state->slice_state.slice_cache;
state->slice_state.slice_cache = NULL;
_Py_NewReference((PyObject *)obj);
}
else {
else
#endif
{
obj = PyObject_GC_New(PySliceObject, &PySlice_Type);
if (obj == NULL) {
goto error;
Expand Down Expand Up @@ -358,15 +364,18 @@ Create a slice object. This is used for extended slicing (e.g. a[0:10:2]).");
static void
slice_dealloc(PySliceObject *r)
{
_PyFreeListState *state = _PyFreeListState_GET();
_PyObject_GC_UNTRACK(r);
Py_DECREF(r->step);
Py_DECREF(r->start);
Py_DECREF(r->stop);
#ifdef WITH_FREELISTS
_PyFreeListState *state = _PyFreeListState_GET();
if (state->slice_state.slice_cache == NULL) {
state->slice_state.slice_cache = r;
}
else {
else
#endif
{
PyObject_GC_Del(r);
}
}
Expand Down

0 comments on commit 36d338f

Please sign in to comment.