Use _Py_RVALUE() in macros (#99844)

The following macros are modified to use _Py_RVALUE(), so they can no
longer be used as l-value:

* DK_LOG_SIZE()
* _PyCode_CODE()
* _PyList_ITEMS()
* _PyTuple_ITEMS()
* _Py_SLIST_HEAD()
* _Py_SLIST_ITEM_NEXT()

_PyCode_CODE() is private and other macros are part of the internal
C API.

diff --git a/Include/cpython/code.h b/Include/cpython/code.h
index 15b464fe2ee95ca4a3e114a35a133f37cbb8ec84..fd57e0035bc09af0c14c38e380c5089189b0032b 100644 (file)
--- a/Include/cpython/code.h
+++ b/Include/cpython/code.h
@@ -153,7 +153,7 @@ static inline Py_ssize_t PyCode_GetNumFree(PyCodeObject *op) {
     return op->co_nfreevars;
 }
 
-#define _PyCode_CODE(CO) ((_Py_CODEUNIT *)(CO)->co_code_adaptive)
+#define _PyCode_CODE(CO) _Py_RVALUE((_Py_CODEUNIT *)(CO)->co_code_adaptive)
 #define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))
 
 /* Public interface */

diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h
index 04b7084901303d15c29787de8c70a8c00043167e..2b3b56b343ad996a937c04aa4bb82e358dccaf8f 100644 (file)
--- a/Include/internal/pycore_dict.h
+++ b/Include/internal/pycore_dict.h
@@ -122,7 +122,7 @@ struct _dictvalues {
     PyObject *values[1];
 };
 
-#define DK_LOG_SIZE(dk)  ((dk)->dk_log2_size)
+#define DK_LOG_SIZE(dk)  _Py_RVALUE((dk)->dk_log2_size)
 #if SIZEOF_VOID_P > 4
 #define DK_SIZE(dk)      (((int64_t)1)<<DK_LOG_SIZE(dk))
 #else

diff --git a/Include/internal/pycore_hashtable.h b/Include/internal/pycore_hashtable.h
index 2aa23a24c2830ad03048dd10e2346d40f4752ce6..6501ab14d27684208e0c25d07f5752b6651095f0 100644 (file)
--- a/Include/internal/pycore_hashtable.h
+++ b/Include/internal/pycore_hashtable.h
@@ -18,9 +18,9 @@ typedef struct {
     _Py_slist_item_t *head;
 } _Py_slist_t;
 
-#define _Py_SLIST_ITEM_NEXT(ITEM) (((_Py_slist_item_t *)(ITEM))->next)
+#define _Py_SLIST_ITEM_NEXT(ITEM) _Py_RVALUE(((_Py_slist_item_t *)(ITEM))->next)
 
-#define _Py_SLIST_HEAD(SLIST) (((_Py_slist_t *)(SLIST))->head)
+#define _Py_SLIST_HEAD(SLIST) _Py_RVALUE(((_Py_slist_t *)(SLIST))->head)
 
 
 /* _Py_hashtable: table entry */

diff --git a/Include/internal/pycore_list.h b/Include/internal/pycore_list.h
index 691d13bc8d9ffab36646714f489e9a40a4100149..628267cc8a9618763f875e63c05b7086e2754599 100644 (file)
--- a/Include/internal/pycore_list.h
+++ b/Include/internal/pycore_list.h
@@ -35,7 +35,7 @@ struct _Py_list_state {
 #endif
 };
 
-#define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item)
+#define _PyList_ITEMS(op) _Py_RVALUE(_PyList_CAST(op)->ob_item)
 
 extern int
 _PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem);

diff --git a/Include/internal/pycore_tuple.h b/Include/internal/pycore_tuple.h
index 1efe4fa2bdef943e407e127c8c202748f380bc82..504c36338d9e9698db756ddb3a1abf3545ae4aa7 100644 (file)
--- a/Include/internal/pycore_tuple.h
+++ b/Include/internal/pycore_tuple.h
@@ -62,7 +62,7 @@ struct _Py_tuple_state {
 #endif
 };
 
-#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item)
+#define _PyTuple_ITEMS(op) _Py_RVALUE(_PyTuple_CAST(op)->ob_item)
 
 extern PyObject *_PyTuple_FromArray(PyObject *const *, Py_ssize_t);
 extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);