Revert "Silence compiler warnings in gc.c (python#117422)"

Yhg1s · Yhg1s · commit 8f60f05ca8f3 · 2024-09-29T20:48:08.000+02:00
This reverts commit ddf814d.
diff --git a/Python/gc.c b/Python/gc.c
@@ -1316,7 +1316,6 @@ gc_collect_young(PyThreadState *tstate,
             survivor_count++;
         }
     }
-    (void)survivor_count;  // Silence compiler warning
     gc_list_merge(&survivors, visited);
     validate_old(gcstate);
     gcstate->young.count = 0;
@@ -1329,14 +1328,12 @@ gc_collect_young(PyThreadState *tstate,
     add_stats(gcstate, 0, stats);
 }
 
-#ifndef NDEBUG
 static inline int
 IS_IN_VISITED(PyGC_Head *gc, int visited_space)
 {
     assert(visited_space == 0 || flip_old_space(visited_space) == 0);
     return gc_old_space(gc) == visited_space;
 }
-#endif
 
 struct container_and_flag {
     PyGC_Head *container;

Original file line number	Diff line number	Diff line change
`@@ -1316,7 +1316,6 @@ gc_collect_young(PyThreadState *tstate,`
`1316`	`1316`	`survivor_count++;`
`1317`	`1317`	`}`
`1318`	`1318`	`}`
`1319`		`- (void)survivor_count; // Silence compiler warning`
`1320`	`1319`	`gc_list_merge(&survivors, visited);`
`1321`	`1320`	`validate_old(gcstate);`
`1322`	`1321`	`gcstate->young.count = 0;`
`@@ -1329,14 +1328,12 @@ gc_collect_young(PyThreadState *tstate,`
`1329`	`1328`	`add_stats(gcstate, 0, stats);`
`1330`	`1329`	`}`
`1331`	`1330`
`1332`		`-#ifndef NDEBUG`
`1333`	`1331`	`static inline int`
`1334`	`1332`	`IS_IN_VISITED(PyGC_Head *gc, int visited_space)`
`1335`	`1333`	`{`
`1336`	`1334`	`assert(visited_space == 0 \|\| flip_old_space(visited_space) == 0);`
`1337`	`1335`	`return gc_old_space(gc) == visited_space;`
`1338`	`1336`	`}`
`1339`		`-#endif`
`1340`	`1337`
`1341`	`1338`	`struct container_and_flag {`
`1342`	`1339`	`PyGC_Head *container;`