bpo-41654: Fix compiler warning in MemoryError_dealloc() (GH-22387) (GH-24894)

miss-islington · vstinner · web-flow · commit 1f0cde678406 · 2021-03-16T18:36:41.000+01:00
Fix warning: Objects\exceptions.c(2324,56): warning C4098: 'MemoryError_dealloc': 'void' function returning a value (cherry picked from commit bbeb223) Co-authored-by: Victor Stinner <vstinner@python.org> Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -2310,7 +2310,8 @@ MemoryError_dealloc(PyBaseExceptionObject *self)
     BaseException_clear(self);
 
     if (!Py_IS_TYPE(self, (PyTypeObject *) PyExc_MemoryError)) {
-        return Py_TYPE(self)->tp_free((PyObject *)self);
+        Py_TYPE(self)->tp_free((PyObject *)self);
+        return;
     }
 
     _PyObject_GC_UNTRACK(self);

Original file line number	Diff line number	Diff line change
`@@ -2310,7 +2310,8 @@ MemoryError_dealloc(PyBaseExceptionObject *self)`
`2310`	`2310`	`BaseException_clear(self);`
`2311`	`2311`
`2312`	`2312`	`if (!Py_IS_TYPE(self, (PyTypeObject *) PyExc_MemoryError)) {`
`2313`		`- return Py_TYPE(self)->tp_free((PyObject *)self);`
	`2313`	`+ Py_TYPE(self)->tp_free((PyObject *)self);`
	`2314`	`+ return;`
`2314`	`2315`	`}`
`2315`	`2316`
`2316`	`2317`	`_PyObject_GC_UNTRACK(self);`