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

sergey-miryanov · web-flow · commit c560df9658f1 · 2025-07-10T22:13:23.000+01:00
diff --git a/Lib/test/test_gc.py b/Lib/test/test_gc.py
@@ -732,13 +732,18 @@ def run_command(code):
         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 "
                       b"shutdown", stderr)
         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).
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-07-10-23-23-50.gh-issue-136517._NHJyv.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-07-10-23-23-50.gh-issue-136517._NHJyv.rst
@@ -0,0 +1,2 @@
+Fixed a typo that prevented printing of uncollectable objects when the
+:const:`gc.DEBUG_UNCOLLECTABLE` mode was set.
diff --git a/Python/gc.c b/Python/gc.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed a typo that prevented printing of uncollectable objects when the`
	`2`	+:const:`gc.DEBUG_UNCOLLECTABLE` mode was set.
Original file line number	Diff line number	Diff line change
`@@ -1782,7 +1782,7 @@ gc_collect_region(PyThreadState *tstate,`
`1782`	`1782`	`Py_ssize_t n = 0;`
`1783`	`1783`	`for (gc = GC_NEXT(&finalizers); gc != &finalizers; gc = GC_NEXT(gc)) {`
`1784`	`1784`	`n++;`
`1785`		`- if (gcstate->debug & _PyGC_DEBUG_COLLECTABLE)`
	`1785`	`+ if (gcstate->debug & _PyGC_DEBUG_UNCOLLECTABLE)`
`1786`	`1786`	`debug_cycle("uncollectable", FROM_GC(gc));`
`1787`	`1787`	`}`
`1788`	`1788`	`stats->uncollectable = n;`