pythongh-116397: Move the _PyGC_ClearAllFreeLists to the safe point

corona10 · corona10 · commit 9ec369fd49dd · 2024-03-06T23:26:28.000+09:00
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -1046,7 +1046,7 @@ def test_getallocatedblocks(self):
         self.assertLessEqual(b, a)
         gc.collect()
         c = sys.getallocatedblocks()
-        self.assertIn(c, range(b - 50, b + 50))
+        self.assertLessEqual(c, b)
 
     def test_is_finalizing(self):
         self.assertIs(sys.is_finalizing(), False)
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
@@ -1058,6 +1058,8 @@ gc_collect_internal(PyInterpreterState *interp, struct collection_state *state)
     // Handle any objects that may have resurrected after the finalization.
     _PyEval_StopTheWorld(interp);
     err = handle_resurrected_objects(state);
+    // Clear free lists in all threads
+    _PyGC_ClearAllFreeLists(interp);
     _PyEval_StartTheWorld(interp);
 
     if (err < 0) {
@@ -1160,9 +1162,6 @@ gc_collect_main(PyThreadState *tstate, int generation, _PyGC_Reason reason)
             n+m, n, d);
     }
 
-    // Clear free lists in all threads
-    _PyGC_ClearAllFreeLists(interp);
-
     if (_PyErr_Occurred(tstate)) {
         if (reason == _Py_GC_REASON_SHUTDOWN) {
             _PyErr_Clear(tstate);
