[3.14] gh-135839: Fix `module_traverse` and `module_clear` in subinterp modules ...

gh-135839: Fix `module_traverse` and `module_clear` in subinterp modules (GH-135937)
(cherry picked from commit bcc2cbaa7f112323939e853ed69fd82f19568ccf)

Co-authored-by: sobolevn <mail@sobolevn.me>

diff --git a/Modules/_interpqueuesmodule.c b/Modules/_interpqueuesmodule.c
index de06b8b41fe585ab58e075f278d40bd3c983ce2f..e5afe746f90bdc92cbd68b3c316418b8ab0efed9 100644 (file)
--- a/Modules/_interpqueuesmodule.c
+++ b/Modules/_interpqueuesmodule.c
@@ -1952,8 +1952,7 @@ static int
 module_traverse(PyObject *mod, visitproc visit, void *arg)
 {
     module_state *state = get_module_state(mod);
-    (void)traverse_module_state(state, visit, arg);
-    return 0;
+    return traverse_module_state(state, visit, arg);
 }
 
 static int
@@ -1962,8 +1961,7 @@ module_clear(PyObject *mod)
     module_state *state = get_module_state(mod);
 
     // Now we clear the module state.
-    (void)clear_module_state(state);
-    return 0;
+    return clear_module_state(state);
 }
 
 static void

diff --git a/Modules/_interpretersmodule.c b/Modules/_interpretersmodule.c
index b920c32474f4e62b6c3662a65177e71ef6862931..e7feaa7f186aeebeebcb158e545a394fc2fb4834 100644 (file)
--- a/Modules/_interpretersmodule.c
+++ b/Modules/_interpretersmodule.c
@@ -1706,8 +1706,7 @@ module_traverse(PyObject *mod, visitproc visit, void *arg)
 {
     module_state *state = get_module_state(mod);
     assert(state != NULL);
-    (void)traverse_module_state(state, visit, arg);
-    return 0;
+    return traverse_module_state(state, visit, arg);
 }
 
 static int
@@ -1715,8 +1714,7 @@ module_clear(PyObject *mod)
 {
     module_state *state = get_module_state(mod);
     assert(state != NULL);
-    (void)clear_module_state(state);
-    return 0;
+    return clear_module_state(state);
 }
 
 static void