[3.14] gh-135839: Fix module_traverse and module_clear in subinterp modules (GH-135937) (#135939)

miss-islington · sobolevn · web-flow · commit 6e5350d8b958 · 2025-06-25T17:42:57.000+03:00
gh-135839: Fix `module_traverse` and `module_clear` in subinterp modules (GH-135937) (cherry picked from commit bcc2cba) Co-authored-by: sobolevn <mail@sobolevn.me>
diff --git 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
@@ -1706,17 +1706,15 @@ 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
 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

Original file line number	Diff line number	Diff line change
`@@ -1952,8 +1952,7 @@ static int`
`1952`	`1952`	`module_traverse(PyObject mod, visitproc visit, void arg)`
`1953`	`1953`	`{`
`1954`	`1954`	`module_state *state = get_module_state(mod);`
`1955`		`- (void)traverse_module_state(state, visit, arg);`
`1956`		`- return 0;`
	`1955`	`+ return traverse_module_state(state, visit, arg);`
`1957`	`1956`	`}`
`1958`	`1957`
`1959`	`1958`	`static int`
`@@ -1962,8 +1961,7 @@ module_clear(PyObject *mod)`
`1962`	`1961`	`module_state *state = get_module_state(mod);`
`1963`	`1962`
`1964`	`1963`	`// Now we clear the module state.`
`1965`		`- (void)clear_module_state(state);`
`1966`		`- return 0;`
	`1964`	`+ return clear_module_state(state);`
`1967`	`1965`	`}`
`1968`	`1966`
`1969`	`1967`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -1706,17 +1706,15 @@ module_traverse(PyObject mod, visitproc visit, void arg)`
`1706`	`1706`	`{`
`1707`	`1707`	`module_state *state = get_module_state(mod);`
`1708`	`1708`	`assert(state != NULL);`
`1709`		`- (void)traverse_module_state(state, visit, arg);`
`1710`		`- return 0;`
	`1709`	`+ return traverse_module_state(state, visit, arg);`
`1711`	`1710`	`}`
`1712`	`1711`
`1713`	`1712`	`static int`
`1714`	`1713`	`module_clear(PyObject *mod)`
`1715`	`1714`	`{`
`1716`	`1715`	`module_state *state = get_module_state(mod);`
`1717`	`1716`	`assert(state != NULL);`
`1718`		`- (void)clear_module_state(state);`
`1719`		`- return 0;`
	`1717`	`+ return clear_module_state(state);`
`1720`	`1718`	`}`
`1721`	`1719`
`1722`	`1720`	`static void`