gh-136517: Print uncollectable objects if DEBUG_UNCOLLECTABLE mode was set (#136518)

This commit is contained in:
Sergey Miryanov 2025-07-10 14:13:23 -07:00 committed by GitHub
parent 59acdba820
commit c560df9658
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 1 deletions

View file

@ -732,6 +732,9 @@ class GCTests(unittest.TestCase):
self.assertIn(b"ResourceWarning: gc: 2 uncollectable objects at "
b"shutdown; use", stderr)
self.assertNotIn(b"<X 'first'>", stderr)
one_line_re = b"gc: uncollectable <X 0x[0-9A-Fa-f]+>"
expected_re = one_line_re + b"\r?\n" + one_line_re
self.assertNotRegex(stderr, expected_re)
# With DEBUG_UNCOLLECTABLE, the garbage list gets printed
stderr = run_command(code % "gc.DEBUG_UNCOLLECTABLE")
self.assertIn(b"ResourceWarning: gc: 2 uncollectable objects at "
@ -739,6 +742,8 @@ class GCTests(unittest.TestCase):
self.assertTrue(
(b"[<X 'first'>, <X 'second'>]" in stderr) or
(b"[<X 'second'>, <X 'first'>]" in stderr), stderr)
# we expect two lines with uncollectable objects
self.assertRegex(stderr, expected_re)
# With DEBUG_SAVEALL, no additional message should get printed
# (because gc.garbage also contains normally reclaimable cyclic
# references, and its elements get printed at runtime anyway).

View file

@ -0,0 +1,2 @@
Fixed a typo that prevented printing of uncollectable objects when the
:const:`gc.DEBUG_UNCOLLECTABLE` mode was set.

View file

@ -1782,7 +1782,7 @@ gc_collect_region(PyThreadState *tstate,
Py_ssize_t n = 0;
for (gc = GC_NEXT(&finalizers); gc != &finalizers; gc = GC_NEXT(gc)) {
n++;
if (gcstate->debug & _PyGC_DEBUG_COLLECTABLE)
if (gcstate->debug & _PyGC_DEBUG_UNCOLLECTABLE)
debug_cycle("uncollectable", FROM_GC(gc));
}
stats->uncollectable = n;