Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Lib/test/test_capi/test_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,17 @@ class EnableDeferredRefcountingTest(unittest.TestCase):
@support.requires_resource("cpu")
def test_enable_deferred_refcount(self):
from threading import Thread
import gc

self.assertEqual(_testcapi.pyobject_enable_deferred_refcount("not tracked"), 0)
foo = []
self.assertEqual(_testcapi.pyobject_enable_deferred_refcount(foo), int(support.Py_GIL_DISABLED))

# The object must be tracked by the GC
not_gc_tracked = tuple([1, 2])
self.assertFalse(gc.is_tracked(not_gc_tracked))
self.assertEqual(_testcapi.pyobject_enable_deferred_refcount(not_gc_tracked), 0)

# Make sure reference counting works on foo now
self.assertEqual(foo, [])
if support.Py_GIL_DISABLED:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
:c:func:`PyUnstable_Object_EnableDeferredRefcount` now returns ``0`` if the
object is not tracked by the garbage collector: if :func:`gc.is_tracked` is
false. Patch by Victor Stinner.
7 changes: 7 additions & 0 deletions Objects/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -2821,6 +2821,13 @@ PyUnstable_Object_EnableDeferredRefcount(PyObject *op)
return 0;
}

if (!PyObject_GC_IsTracked(op)) {
// When deferred refcount is enabled, the object will only be
// deallocated by the tracing garbage collector. So it must be tracked
// by the garbage collector.
return 0;
}

uint8_t bits = _Py_atomic_load_uint8(&op->ob_gc_bits);
if ((bits & _PyGC_BITS_DEFERRED) != 0)
{
Expand Down
Loading