mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Remove GC related code. It lives in gcmodule now.

Browse source
This commit is contained in:
Neil Schemenauer 2001-08-29 23:54:03 +00:00
parent 4f4817fee8
commit fd34369ecb
1 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Objects/object.c
View file

@ -93,8 +93,6 @@ PyObject_Init(PyObject *op, PyTypeObject *tp)
"NULL object passed to PyObject_Init"); "NULL object passed to PyObject_Init");
return op; return op;
} }
if (PyType_IS_GC(tp))
op = (PyObject *) PyObject_FROM_GC(op);
/* Any changes should be reflected in PyObject_INIT (objimpl.h) */ /* Any changes should be reflected in PyObject_INIT (objimpl.h) */
op->ob_type = tp; op->ob_type = tp;
_Py_NewReference(op); _Py_NewReference(op);
@ -109,8 +107,6 @@ PyObject_InitVar(PyVarObject *op, PyTypeObject *tp, int size)
"NULL object passed to PyObject_InitVar"); "NULL object passed to PyObject_InitVar");
return op; return op;
} }
if (PyType_IS_GC(tp))
op = (PyVarObject *) PyObject_FROM_GC(op);
/* Any changes should be reflected in PyObject_INIT_VAR */ /* Any changes should be reflected in PyObject_INIT_VAR */
op->ob_size = size; op->ob_size = size;
op->ob_type = tp; op->ob_type = tp;
@ -125,8 +121,6 @@ _PyObject_New(PyTypeObject *tp)
op = (PyObject *) PyObject_MALLOC(_PyObject_SIZE(tp)); op = (PyObject *) PyObject_MALLOC(_PyObject_SIZE(tp));
if (op == NULL) if (op == NULL)
return PyErr_NoMemory(); return PyErr_NoMemory();
if (PyType_IS_GC(tp))
op = (PyObject *) PyObject_FROM_GC(op);
return PyObject_INIT(op, tp); return PyObject_INIT(op, tp);
} }
@ -137,26 +131,15 @@ _PyObject_NewVar(PyTypeObject *tp, int size)
op = (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE(tp, size)); op = (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE(tp, size));
if (op == NULL) if (op == NULL)
return (PyVarObject *)PyErr_NoMemory(); return (PyVarObject *)PyErr_NoMemory();
if (PyType_IS_GC(tp))
op = (PyVarObject *) PyObject_FROM_GC(op);
return PyObject_INIT_VAR(op, tp, size); return PyObject_INIT_VAR(op, tp, size);
} }
void void
_PyObject_Del(PyObject *op) _PyObject_Del(PyObject *op)
{ {
if (op && PyType_IS_GC(op->ob_type)) {
op = (PyObject *) PyObject_AS_GC(op);
}
PyObject_FREE(op); PyObject_FREE(op);
} }
#ifndef WITH_CYCLE_GC
/* extension modules might need these */
void _PyGC_Insert(PyObject *op) { }
void _PyGC_Remove(PyObject *op) { }
#endif
int int
PyObject_Print(PyObject *op, FILE *fp, int flags) PyObject_Print(PyObject *op, FILE *fp, int flags)
{ {
@ -215,14 +198,6 @@ void _PyObject_Dump(PyObject* op)
} }
} }
#ifdef WITH_CYCLE_GC
void _PyGC_Dump(PyGC_Head* op)
{
_PyObject_Dump(PyObject_FROM_GC(op));
}
#endif /* WITH_CYCLE_GC */
PyObject * PyObject *
PyObject_Repr(PyObject *v) PyObject_Repr(PyObject *v)
{ {
@ -1146,7 +1121,7 @@ _PyObject_GetDictPtr(PyObject *obj)
if (dictoffset == 0) if (dictoffset == 0)
return NULL; return NULL;
if (dictoffset < 0) { if (dictoffset < 0) {
dictoffset += PyType_BASICSIZE(tp); dictoffset += tp->tp_basicsize;
assert(dictoffset > 0); /* Sanity check */ assert(dictoffset > 0); /* Sanity check */
if (tp->tp_itemsize > 0) { if (tp->tp_itemsize > 0) {
int n = ((PyVarObject *)obj)->ob_size; int n = ((PyVarObject *)obj)->ob_size;