Remove calls to 2.1 GC API (they are noops).

diff --git a/Objects/iterobject.c b/Objects/iterobject.c
index 5783d2085bc07d038d6e28f1b685a275a3e9d330..8f8d70bfe2ec060e45a7a23aeaf2f6431bec424e 100644 (file)
--- a/Objects/iterobject.c
+++ b/Objects/iterobject.c
@@ -18,15 +18,12 @@ PySeqIter_New(PyObject *seq)
        it->it_index = 0;
        Py_INCREF(seq);
        it->it_seq = seq;
-       PyObject_GC_Init(it);
        return (PyObject *)it;
 }
 static void
 iter_dealloc(seqiterobject *it)
 {
-       PyObject_GC_Fini(it);
        Py_DECREF(it->it_seq);
-       it = (seqiterobject *) PyObject_AS_GC(it);
        PyObject_DEL(it);
 }
 
@@ -100,7 +97,7 @@ PyTypeObject PySeqIter_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                                      /* ob_size */
        "iterator",                             /* tp_name */
-       sizeof(seqiterobject) + PyGC_HEAD_SIZE, /* tp_basicsize */
+       sizeof(seqiterobject),                  /* tp_basicsize */
        0,                                      /* tp_itemsize */
        /* methods */
        (destructor)iter_dealloc,               /* tp_dealloc */
@@ -118,7 +115,7 @@ PyTypeObject PySeqIter_Type = {
        PyObject_GenericGetAttr,                /* tp_getattro */
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,     /* tp_flags */
+       Py_TPFLAGS_DEFAULT,                     /* tp_flags */
        0,                                      /* tp_doc */
        (traverseproc)iter_traverse,            /* tp_traverse */
        0,                                      /* tp_clear */
@@ -154,16 +151,13 @@ PyCallIter_New(PyObject *callable, PyObject *sentinel)
        it->it_callable = callable;
        Py_INCREF(sentinel);
        it->it_sentinel = sentinel;
-       PyObject_GC_Init(it);
        return (PyObject *)it;
 }
 static void
 calliter_dealloc(calliterobject *it)
 {
-       PyObject_GC_Fini(it);
        Py_DECREF(it->it_callable);
        Py_DECREF(it->it_sentinel);
-       it = (calliterobject *) PyObject_AS_GC(it);
        PyObject_DEL(it);
 }
 
@@ -218,7 +212,7 @@ PyTypeObject PyCallIter_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                                      /* ob_size */
        "callable-iterator",                    /* tp_name */
-       sizeof(calliterobject) + PyGC_HEAD_SIZE,/* tp_basicsize */
+       sizeof(calliterobject),                 /* tp_basicsize */
        0,                                      /* tp_itemsize */
        /* methods */
        (destructor)calliter_dealloc,           /* tp_dealloc */
@@ -236,7 +230,7 @@ PyTypeObject PyCallIter_Type = {
        PyObject_GenericGetAttr,                /* tp_getattro */
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,     /* tp_flags */
+       Py_TPFLAGS_DEFAULT,                     /* tp_flags */
        0,                                      /* tp_doc */
        (traverseproc)calliter_traverse,        /* tp_traverse */
        0,                                      /* tp_clear */

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index e0968afc763cb9464fd0ea7a89157b80731dcf30..ea4fa1fc3a37e64f5b62e87bb685cc65072e3d89 100644 (file)
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -22,7 +22,6 @@ PyCFunction_New(PyMethodDef *ml, PyObject *self)
        op->m_ml = ml;
        Py_XINCREF(self);
        op->m_self = self;
-       PyObject_GC_Init(op);
        return (PyObject *)op;
 }
 
@@ -111,7 +110,6 @@ PyCFunction_Call(PyObject *func, PyObject *arg, PyObject *kw)
 static void
 meth_dealloc(PyCFunctionObject *m)
 {
-       PyObject_GC_Fini(m);
        Py_XDECREF(m->m_self);
        m->m_self = (PyObject *)free_list;
        free_list = m;
@@ -216,7 +214,7 @@ PyTypeObject PyCFunction_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,
        "builtin_function_or_method",
-       sizeof(PyCFunctionObject) + PyGC_HEAD_SIZE,
+       sizeof(PyCFunctionObject),
        0,
        (destructor)meth_dealloc,               /* tp_dealloc */
        0,                                      /* tp_print */
@@ -233,7 +231,7 @@ PyTypeObject PyCFunction_Type = {
        PyObject_GenericGetAttr,                /* tp_getattro */
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,     /* tp_flags */
+       Py_TPFLAGS_DEFAULT,                     /* tp_flags */
        0,                                      /* tp_doc */
        (traverseproc)meth_traverse,            /* tp_traverse */
        0,                                      /* tp_clear */
@@ -327,7 +325,6 @@ PyCFunction_Fini(void)
        while (free_list) {
                PyCFunctionObject *v = free_list;
                free_list = (PyCFunctionObject *)(v->m_self);
-               v = (PyCFunctionObject *) PyObject_AS_GC(v);
                PyObject_DEL(v);
        }
 }

diff --git a/Python/ceval.c b/Python/ceval.c
index 914431afb18344aeb8fe6d4ce626c3a394ab2f6c..57922598e2634da7d08b813d81d5a24d2eb59a56 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -107,7 +107,6 @@ gen_new(PyFrameObject *f)
        }
        gen->gi_frame = f;
        gen->gi_running = 0;
-       PyObject_GC_Init(gen);
        return (PyObject *)gen;
 }
 
@@ -120,7 +119,6 @@ gen_traverse(genobject *gen, visitproc visit, void *arg)
 static void
 gen_dealloc(genobject *gen)
 {
-       PyObject_GC_Fini(gen);
        Py_DECREF(gen->gi_frame);
        PyObject_Del(gen);
 }
@@ -204,7 +202,7 @@ statichere PyTypeObject gentype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                                      /* ob_size */
        "generator",                            /* tp_name */
-       sizeof(genobject) + PyGC_HEAD_SIZE,     /* tp_basicsize */
+       sizeof(genobject),                      /* tp_basicsize */
        0,                                      /* tp_itemsize */
        /* methods */
        (destructor)gen_dealloc,                /* tp_dealloc */
@@ -222,7 +220,7 @@ statichere PyTypeObject gentype = {
        PyObject_GenericGetAttr,                /* tp_getattro */
        0,                                      /* tp_setattro */
        0,                                      /* tp_as_buffer */
-       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC,     /* tp_flags */
+       Py_TPFLAGS_DEFAULT,                     /* tp_flags */
        0,                                      /* tp_doc */
        (traverseproc)gen_traverse,             /* tp_traverse */
        0,                                      /* tp_clear */