bpo-40170: Convert PyObject_IS_GC() macro to a function (GH-19464) · python/cpython@675d9a3 (original) (raw)

`@@ -442,7 +442,7 @@ visit_decref(PyObject *op, void *parent)

`

442

442

`{

`

443

443

`_PyObject_ASSERT(_PyObject_CAST(parent), !_PyObject_IsFreed(op));

`

444

444

``

445

``

`-

if (PyObject_IS_GC(op)) {

`

``

445

`+

if (_PyObject_IS_GC(op)) {

`

446

446

`PyGC_Head *gc = AS_GC(op);

`

447

447

`/* We're only interested in gc_refs for objects in the

`

448

448

` * generation being collected, which can be recognized

`

`@@ -478,7 +478,7 @@ subtract_refs(PyGC_Head *containers)

`

478

478

`static int

`

479

479

`visit_reachable(PyObject *op, PyGC_Head *reachable)

`

480

480

`{

`

481

``

`-

if (!PyObject_IS_GC(op)) {

`

``

481

`+

if (!_PyObject_IS_GC(op)) {

`

482

482

`return 0;

`

483

483

` }

`

484

484

``

`@@ -705,7 +705,7 @@ clear_unreachable_mask(PyGC_Head *unreachable)

`

705

705

`static int

`

706

706

`visit_move(PyObject *op, PyGC_Head *tolist)

`

707

707

`{

`

708

``

`-

if (PyObject_IS_GC(op)) {

`

``

708

`+

if (_PyObject_IS_GC(op)) {

`

709

709

`PyGC_Head *gc = AS_GC(op);

`

710

710

`if (gc_is_collecting(gc)) {

`

711

711

`gc_list_move(gc, tolist);

`

`@@ -1716,7 +1716,7 @@ gc_get_referents(PyObject *self, PyObject *args)

`

1716

1716

`traverseproc traverse;

`

1717

1717

`PyObject *obj = PyTuple_GET_ITEM(args, i);

`

1718

1718

``

1719

``

`-

if (! PyObject_IS_GC(obj))

`

``

1719

`+

if (!_PyObject_IS_GC(obj))

`

1720

1720

`continue;

`

1721

1721

`traverse = Py_TYPE(obj)->tp_traverse;

`

1722

1722

`if (! traverse)

`

`@@ -1856,7 +1856,7 @@ gc_is_tracked(PyObject *module, PyObject *obj)

`

1856

1856

`{

`

1857

1857

`PyObject *result;

`

1858

1858

``

1859

``

`-

if (PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj))

`

``

1859

`+

if (_PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj))

`

1860

1860

`result = Py_True;

`

1861

1861

`else

`

1862

1862

`result = Py_False;

`

`@@ -1877,7 +1877,7 @@ static PyObject *

`

1877

1877

`gc_is_finalized(PyObject *module, PyObject *obj)

`

1878

1878

`/[clinic end generated code: output=e1516ac119a918ed input=201d0c58f69ae390]/

`

1879

1879

`{

`

1880

``

`-

if (PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(AS_GC(obj))) {

`

``

1880

`+

if (_PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(AS_GC(obj))) {

`

1881

1881

`Py_RETURN_TRUE;

`

1882

1882

` }

`

1883

1883

`Py_RETURN_FALSE;

`

`@@ -2204,6 +2204,12 @@ PyObject_GC_UnTrack(void *op_raw)

`

2204

2204

` }

`

2205

2205

`}

`

2206

2206

``

``

2207

`+

int

`

``

2208

`+

PyObject_IS_GC(PyObject *obj)

`

``

2209

`+

{

`

``

2210

`+

return _PyObject_IS_GC(obj);

`

``

2211

`+

}

`

``

2212

+

2207

2213

`static PyObject *

`

2208

2214

`_PyObject_GC_Alloc(int use_calloc, size_t basicsize)

`

2209

2215

`{

`

`@@ -2317,7 +2323,7 @@ PyObject_GC_Del(void *op)

`

2317

2323

`int

`

2318

2324

`PyObject_GC_IsTracked(PyObject* obj)

`

2319

2325

`{

`

2320

``

`-

if (PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj)) {

`

``

2326

`+

if (_PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj)) {

`

2321

2327

`return 1;

`

2322

2328

` }

`

2323

2329

`return 0;

`

`@@ -2326,7 +2332,7 @@ PyObject_GC_IsTracked(PyObject* obj)

`

2326

2332

`int

`

2327

2333

`PyObject_GC_IsFinalized(PyObject *obj)

`

2328

2334

`{

`

2329

``

`-

if (PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(AS_GC(obj))) {

`

``

2335

`+

if (_PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(AS_GC(obj))) {

`

2330

2336

`return 1;

`

2331

2337

` }

`

2332

2338

`return 0;

`