summaryrefslogtreecommitdiffstats
path: root/Objects/funcobject.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-10-05 20:51:39 (GMT)
committerGuido van Rossum <guido@python.org>2001-10-05 20:51:39 (GMT)
commit9475a2310d9cdec4b4c36dee8bf30c72605ae928 (patch)
tree54b58a165e7b91118dafaa54a00db24162abdff7 /Objects/funcobject.c
parentbe63884d5069901effb9c045bde43e732c969f71 (diff)
downloadcpython-9475a2310d9cdec4b4c36dee8bf30c72605ae928.zip
cpython-9475a2310d9cdec4b4c36dee8bf30c72605ae928.tar.gz
cpython-9475a2310d9cdec4b4c36dee8bf30c72605ae928.tar.bz2
Enable GC for new-style instances. This touches lots of files, since
many types were subclassable but had a xxx_dealloc function that called PyObject_DEL(self) directly instead of deferring to self->ob_type->tp_free(self). It is permissible to set tp_free in the type object directly to _PyObject_Del, for non-GC types, or to _PyObject_GC_Del, for GC types. Still, PyObject_DEL was a tad faster, so I'm fearing that our pystone rating is going down again. I'm not sure if doing something like void xxx_dealloc(PyObject *self) { if (PyXxxCheckExact(self)) PyObject_DEL(self); else self->ob_type->tp_free(self); } is any faster than always calling the else branch, so I haven't attempted that -- however those types whose own dealloc is fancier (int, float, unicode) do use this pattern.
Diffstat (limited to 'Objects/funcobject.c')
-rw-r--r--Objects/funcobject.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 4e77d52..89dd7f9 100644
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -461,7 +461,7 @@ static void
cm_dealloc(classmethod *cm)
{
Py_XDECREF(cm->cm_callable);
- PyObject_DEL(cm);
+ cm->ob_type->tp_free((PyObject *)cm);
}
static PyObject *
@@ -531,6 +531,7 @@ PyTypeObject PyClassMethod_Type = {
cm_init, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */
PyType_GenericNew, /* tp_new */
+ _PyObject_Del, /* tp_free */
};
PyObject *
@@ -571,7 +572,7 @@ static void
sm_dealloc(staticmethod *sm)
{
Py_XDECREF(sm->sm_callable);
- PyObject_DEL(sm);
+ sm->ob_type->tp_free((PyObject *)sm);
}
static PyObject *
@@ -641,6 +642,7 @@ PyTypeObject PyStaticMethod_Type = {
sm_init, /* tp_init */
PyType_GenericAlloc, /* tp_alloc */
PyType_GenericNew, /* tp_new */
+ _PyObject_Del, /* tp_free */
};
PyObject *