gh-135906: Use _PyObject_CAST in internal headers (GH-135892)

clin1234 · ZeroIntensity · vstinner · web-flow · commit fe187fae8d83 · 2025-07-07T12:56:14.000-04:00
Fixes build errors encountered in python-greenlet/greenlet#450 when building greenlet on the free-threaded build. --------- Co-authored-by: Peter Bierma <zintensitydev@gmail.com> Co-authored-by: Victor Stinner <vstinner@python.org>
diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
@@ -614,7 +614,7 @@ static inline PyObject *
 _Py_XGetRef(PyObject **ptr)
 {
     for (;;) {
-        PyObject *value = _Py_atomic_load_ptr(ptr);
+        PyObject *value = _PyObject_CAST(_Py_atomic_load_ptr(ptr));
         if (value == NULL) {
             return value;
         }
@@ -629,7 +629,7 @@ _Py_XGetRef(PyObject **ptr)
 static inline PyObject *
 _Py_TryXGetRef(PyObject **ptr)
 {
-    PyObject *value = _Py_atomic_load_ptr(ptr);
+    PyObject *value = _PyObject_CAST(_Py_atomic_load_ptr(ptr));
     if (value == NULL) {
         return value;
     }
diff --git a/Include/internal/pycore_stackref.h b/Include/internal/pycore_stackref.h
@@ -829,7 +829,7 @@ _Py_TryIncrefCompareStackRef(PyObject **src, PyObject *op, _PyStackRef *out)
 static inline int
 _Py_TryXGetStackRef(PyObject **src, _PyStackRef *out)
 {
-    PyObject *op = _Py_atomic_load_ptr_relaxed(src);
+    PyObject *op = _PyObject_CAST(_Py_atomic_load_ptr_relaxed(src));
     if (op == NULL) {
         *out = PyStackRef_NULL;
         return 1;
diff --git a/Misc/NEWS.d/next/C_API/2025-06-25-01-03-10.gh-issue-135906.UBrCWq.rst b/Misc/NEWS.d/next/C_API/2025-06-25-01-03-10.gh-issue-135906.UBrCWq.rst
@@ -0,0 +1 @@
+Fix compilation errors when compiling the internal headers with a C++ compiler.

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ static inline PyObject *`
`614`	`614`	`_Py_XGetRef(PyObject **ptr)`
`615`	`615`	`{`
`616`	`616`	`for (;;) {`
`617`		`- PyObject *value = _Py_atomic_load_ptr(ptr);`
	`617`	`+ PyObject *value = _PyObject_CAST(_Py_atomic_load_ptr(ptr));`
`618`	`618`	`if (value == NULL) {`
`619`	`619`	`return value;`
`620`	`620`	`}`
`@@ -629,7 +629,7 @@ _Py_XGetRef(PyObject **ptr)`
`629`	`629`	`static inline PyObject *`
`630`	`630`	`_Py_TryXGetRef(PyObject **ptr)`
`631`	`631`	`{`
`632`		`- PyObject *value = _Py_atomic_load_ptr(ptr);`
	`632`	`+ PyObject *value = _PyObject_CAST(_Py_atomic_load_ptr(ptr));`
`633`	`633`	`if (value == NULL) {`
`634`	`634`	`return value;`
`635`	`635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ _Py_TryIncrefCompareStackRef(PyObject *src, PyObject op, _PyStackRef *out)`
`829`	`829`	`static inline int`
`830`	`830`	`_Py_TryXGetStackRef(PyObject *src, _PyStackRef out)`
`831`	`831`	`{`
`832`		`- PyObject *op = _Py_atomic_load_ptr_relaxed(src);`
	`832`	`+ PyObject *op = _PyObject_CAST(_Py_atomic_load_ptr_relaxed(src));`
`833`	`833`	`if (op == NULL) {`
`834`	`834`	`*out = PyStackRef_NULL;`
`835`	`835`	`return 1;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix compilation errors when compiling the internal headers with a C++ compiler.`