From 23ae2c6b7f62629937f37cb41997211b99432b29 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 11 Jun 2021 10:35:36 +0200 Subject: [PATCH] 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 --- Include/object.h | 4 +++- .../next/C API/2021-06-10-15-22-31.bpo-44378.jGYakF.rst | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/C API/2021-06-10-15-22-31.bpo-44378.jGYakF.rst diff --git a/Include/object.h b/Include/object.h index 4c069998574b4a..109f535249cda8 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 00000000000000..b620b499f23512 --- /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.