From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 11 Jun 2021 08:57:16 +0000 (-0700)
Subject: bpo-44378: Fix a compiler warning in Py_IS_TYPE() (GH-26644)
X-Git-Tag: v3.10.0b3~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6d28a1a6ad22125fc3a6df2d611d79aa8d6f67e;p=thirdparty%2FPython%2Fcpython.git

bpo-44378: Fix a compiler warning in Py_IS_TYPE() (GH-26644)


Py_IS_TYPE() no longer uses Py_TYPE() to avoid a compiler warning:
no longer cast "const PyObject*" to "PyObject*".
(cherry picked from commit 304dfec8d3c0763734ea8b5fa2af1d9e1ce69ffa)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Include/object.h b/Include/object.h
index 4c069998574b..109f535249cd 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -141,7 +141,9 @@ static inline Py_ssize_t _Py_REFCNT(const PyObject *ob) {
 
 
 static inline int _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) {
-    return Py_TYPE(ob) == type;
+    // bpo-44378: Don't use Py_TYPE() since Py_TYPE() requires a non-const
+    // object.
+    return ob->ob_type == type;
 }
 #define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)
 
diff --git a/Misc/NEWS.d/next/C API/2021-06-10-15-22-31.bpo-44378.jGYakF.rst b/Misc/NEWS.d/next/C API/2021-06-10-15-22-31.bpo-44378.jGYakF.rst
new file mode 100644
index 000000000000..b620b499f235
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-06-10-15-22-31.bpo-44378.jGYakF.rst	
@@ -0,0 +1,3 @@
+:c:func:`Py_IS_TYPE` no longer uses :c:func:`Py_TYPE` to avoid a compiler
+warning: no longer cast ``const PyObject*`` to ``PyObject*``.
+Patch by Victor Stinner.