summaryrefslogtreecommitdiffstats
path: root/Objects/sliceobject.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-04-16 21:47:12 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-04-16 21:47:12 (GMT)
commit414f8b937f1ccab9a493b387fa42529416ea1a08 (patch)
tree664ee0f250d2e2827260d486987b166645011869 /Objects/sliceobject.c
parent16b83b1f6672e73a7079bb6655354e506ebb1af2 (diff)
downloadcpython-414f8b937f1ccab9a493b387fa42529416ea1a08.zip
cpython-414f8b937f1ccab9a493b387fa42529416ea1a08.tar.gz
cpython-414f8b937f1ccab9a493b387fa42529416ea1a08.tar.bz2
add gc support to slice (closes #26659)
Diffstat (limited to 'Objects/sliceobject.c')
-rw-r--r--Objects/sliceobject.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 767a50a..3c996f9 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -60,7 +60,7 @@ PyObject _Py_EllipsisObject = {
PyObject *
PySlice_New(PyObject *start, PyObject *stop, PyObject *step)
{
- PySliceObject *obj = PyObject_New(PySliceObject, &PySlice_Type);
+ PySliceObject *obj = PyObject_GC_New(PySliceObject, &PySlice_Type);
if (obj == NULL)
return NULL;
@@ -76,6 +76,7 @@ PySlice_New(PyObject *start, PyObject *stop, PyObject *step)
obj->start = start;
obj->stop = stop;
+ _PyObject_GC_TRACK(obj);
return (PyObject *) obj;
}
@@ -219,10 +220,11 @@ Create a slice object. This is used for extended slicing (e.g. a[0:10:2]).");
static void
slice_dealloc(PySliceObject *r)
{
+ _PyObject_GC_UNTRACK(r);
Py_DECREF(r->step);
Py_DECREF(r->start);
Py_DECREF(r->stop);
- PyObject_Del(r);
+ PyObject_GC_Del(r);
}
static PyObject *
@@ -320,6 +322,15 @@ slice_hash(PySliceObject *v)
return -1L;
}
+static int
+slice_traverse(PySliceObject *v, visitproc visit, void *arg)
+{
+ Py_VISIT(v->start);
+ Py_VISIT(v->stop);
+ Py_VISIT(v->step);
+ return 0;
+}
+
PyTypeObject PySlice_Type = {
PyVarObject_HEAD_INIT(&PyType_Type, 0)
"slice", /* Name of this type */
@@ -340,9 +351,9 @@ PyTypeObject PySlice_Type = {
PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
slice_doc, /* tp_doc */
- 0, /* tp_traverse */
+ (traverseproc)slice_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */