bpo-41654: Explicitly cast PyExc_MemoryError to PyTypeObject to avoid warning (pythonGH-22102)

pablogsal · web-flow · commit 6ae61959ec51 · 2020-09-05T17:07:54.000+01:00
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -2295,8 +2295,9 @@ MemoryError_dealloc(PyBaseExceptionObject *self)
 {
     BaseException_clear(self);
 
-    if (Py_TYPE(self) != PyExc_MemoryError) {
-        return Py_TYPE(self)->tp_free((PyObject *)self);
+    if (Py_TYPE(self) != (PyTypeObject *)PyExc_MemoryError) {
+        Py_TYPE(self)->tp_free((PyObject *)self);
+        return;
     }
 
     _PyObject_GC_UNTRACK(self);

Original file line number	Diff line number	Diff line change
`@@ -2295,8 +2295,9 @@ MemoryError_dealloc(PyBaseExceptionObject *self)`
`2295`	`2295`	`{`
`2296`	`2296`	`BaseException_clear(self);`
`2297`	`2297`
`2298`		`- if (Py_TYPE(self) != PyExc_MemoryError) {`
`2299`		`- return Py_TYPE(self)->tp_free((PyObject *)self);`
	`2298`	`+ if (Py_TYPE(self) != (PyTypeObject *)PyExc_MemoryError) {`
	`2299`	`+ Py_TYPE(self)->tp_free((PyObject *)self);`
	`2300`	`+ return;`
`2300`	`2301`	`}`
`2301`	`2302`
`2302`	`2303`	`_PyObject_GC_UNTRACK(self);`