Add _PyObject_CAST_CONST; use _PyObject_CAST

vstinner · vstinner · commit 2d1e84400a6b · 2020-12-23T20:02:01.000+01:00
diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
@@ -26,6 +26,9 @@ extern "C" {
 #ifndef _PyObject_CAST
 #  define _PyObject_CAST(op) ((PyObject*)(op))
 #endif
+#ifndef _PyObject_CAST_CONST
+#  define _PyObject_CAST_CONST(op) ((const PyObject*)(op))
+#endif
 
 
 // bpo-42262 added Py_NewRef() to Python 3.10.0a3
@@ -56,7 +59,7 @@ static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt)
 {
     ob->ob_refcnt = refcnt;
 }
-#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT((PyObject*)(ob), refcnt)
+#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt)
 #endif
 
 
@@ -67,7 +70,7 @@ _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
 {
     ob->ob_type = type;
 }
-#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)
 #endif
 
 
@@ -270,7 +273,7 @@ static inline int
 _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) {
     return ob->ob_type == type;
 }
-#define Py_IS_TYPE(ob, type) _Py_IS_TYPE((const PyObject*)(ob), type)
+#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ extern "C" {`
`26`	`26`	`#ifndef _PyObject_CAST`
`27`	`27`	`# define _PyObject_CAST(op) ((PyObject*)(op))`
`28`	`28`	`#endif`
	`29`	`+#ifndef _PyObject_CAST_CONST`
	`30`	`+# define _PyObject_CAST_CONST(op) ((const PyObject*)(op))`
	`31`	`+#endif`
`29`	`32`
`30`	`33`
`31`	`34`	`// bpo-42262 added Py_NewRef() to Python 3.10.0a3`
`@@ -56,7 +59,7 @@ static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt)`
`56`	`59`	`{`
`57`	`60`	`ob->ob_refcnt = refcnt;`
`58`	`61`	`}`
`59`		`-#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT((PyObject*)(ob), refcnt)`
	`62`	`+#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt)`
`60`	`63`	`#endif`
`61`	`64`
`62`	`65`
`@@ -67,7 +70,7 @@ _Py_SET_TYPE(PyObject ob, PyTypeObject type)`
`67`	`70`	`{`
`68`	`71`	`ob->ob_type = type;`
`69`	`72`	`}`
`70`		`-#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)`
	`73`	`+#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)`
`71`	`74`	`#endif`
`72`	`75`
`73`	`76`
`@@ -270,7 +273,7 @@ static inline int`
`270`	`273`	`_Py_IS_TYPE(const PyObject ob, const PyTypeObject type) {`
`271`	`274`	`return ob->ob_type == type;`
`272`	`275`	`}`
`273`		`-#define Py_IS_TYPE(ob, type) _Py_IS_TYPE((const PyObject*)(ob), type)`
	`276`	`+#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type)`
`274`	`277`	`#endif`
`275`	`278`
`276`	`279`