summaryrefslogtreecommitdiffstats
path: root/Objects/stringobject.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/stringobject.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/stringobject.c')
-rw-r--r--Objects/stringobject.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index a43f129..8fab6a9 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -481,7 +481,7 @@ PyObject *PyString_AsEncodedString(PyObject *str,
static void
string_dealloc(PyObject *op)
{
- PyObject_DEL(op);
+ op->ob_type->tp_free(op);
}
static int
@@ -2746,6 +2746,7 @@ PyTypeObject PyString_Type = {
0, /* tp_init */
0, /* tp_alloc */
string_new, /* tp_new */
+ _PyObject_Del, /* tp_free */
};
void