Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Victor Stinner 2022-11-28 17:42:22 +01:00 committed by GitHub
parent 65417988a5
commit 7bae15cf37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/cpython/code.h
View File

@ -153,7 +153,7 @@ static inline Py_ssize_t PyCode_GetNumFree(PyCodeObject *op) {
return op->co_nfreevars; 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)) #define _PyCode_NBYTES(CO) (Py_SIZE(CO) * (Py_ssize_t)sizeof(_Py_CODEUNIT))
/* Public interface */ /* Public interface */

2
Include/internal/pycore_dict.h
View File

@ -122,7 +122,7 @@ struct _dictvalues {
PyObject *values[1]; 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 #if SIZEOF_VOID_P > 4
#define DK_SIZE(dk) (((int64_t)1)<<DK_LOG_SIZE(dk)) #define DK_SIZE(dk) (((int64_t)1)<<DK_LOG_SIZE(dk))
#else #else

4
Include/internal/pycore_hashtable.h
View File

@ -18,9 +18,9 @@ typedef struct {
_Py_slist_item_t *head; _Py_slist_item_t *head;
} _Py_slist_t; } _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 */ /* _Py_hashtable: table entry */

2
Include/internal/pycore_list.h
View File

@ -35,7 +35,7 @@ struct _Py_list_state {
#endif #endif
}; };
#define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item) #define _PyList_ITEMS(op) _Py_RVALUE(_PyList_CAST(op)->ob_item)
extern int extern int
_PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem); _PyList_AppendTakeRefListResize(PyListObject *self, PyObject *newitem);

2
Include/internal/pycore_tuple.h
View File

@ -62,7 +62,7 @@ struct _Py_tuple_state {
#endif #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_FromArray(PyObject *const *, Py_ssize_t);
extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t); extern PyObject *_PyTuple_FromArraySteal(PyObject *const *, Py_ssize_t);