diff options
| author | Victor Stinner <vstinner@python.org> | 2022-06-20 14:04:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 14:04:52 (GMT) |
| commit | 7ad6f74fcf9db1ccfeaf0986064870d8d3887300 (patch) | |
| tree | 2b140e0e4fdb3b58379887bab6ff68ade5c67c60 /Include/cpython/object.h | |
| parent | 61f24e7885bed096b5d7f75aff13c1001994b35a (diff) | |
| download | cpython-7ad6f74fcf9db1ccfeaf0986064870d8d3887300.zip cpython-7ad6f74fcf9db1ccfeaf0986064870d8d3887300.tar.gz cpython-7ad6f74fcf9db1ccfeaf0986064870d8d3887300.tar.bz2 | |
gh-87347: Add parenthesis around macro arguments (#93915)
Add unit test on Py_MEMBER_SIZE() and some other macros.
Diffstat (limited to 'Include/cpython/object.h')
| -rw-r--r-- | Include/cpython/object.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Include/cpython/object.h b/Include/cpython/object.h index b018dab..614d6c1 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -45,7 +45,7 @@ typedef struct _Py_Identifier { // For now we are keeping _Py_IDENTIFIER for continued use // in non-builtin extensions (and naughty PyPI modules). -#define _Py_static_string_init(value) { .string = value, .index = -1 } +#define _Py_static_string_init(value) { .string = (value), .index = -1 } #define _Py_static_string(varname, value) static _Py_Identifier varname = _Py_static_string_init(value) #define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname) @@ -385,9 +385,9 @@ _PyObject_DebugTypeStats(FILE *out); #endif #define _PyObject_ASSERT_WITH_MSG(obj, expr, msg) \ - _PyObject_ASSERT_FROM(obj, expr, msg, __FILE__, __LINE__, __func__) + _PyObject_ASSERT_FROM((obj), expr, (msg), __FILE__, __LINE__, __func__) #define _PyObject_ASSERT(obj, expr) \ - _PyObject_ASSERT_WITH_MSG(obj, expr, NULL) + _PyObject_ASSERT_WITH_MSG((obj), expr, NULL) #define _PyObject_ASSERT_FAILED_MSG(obj, msg) \ _PyObject_AssertFailed((obj), NULL, (msg), __FILE__, __LINE__, __func__) @@ -493,8 +493,8 @@ PyAPI_FUNC(int) _PyTrash_cond(PyObject *op, destructor dealloc); } while (0); #define Py_TRASHCAN_BEGIN(op, dealloc) \ - Py_TRASHCAN_BEGIN_CONDITION(op, \ - _PyTrash_cond(_PyObject_CAST(op), (destructor)dealloc)) + Py_TRASHCAN_BEGIN_CONDITION((op), \ + _PyTrash_cond(_PyObject_CAST(op), (destructor)(dealloc))) /* The following two macros, Py_TRASHCAN_SAFE_BEGIN and * Py_TRASHCAN_SAFE_END, are deprecated since version 3.11 and @@ -505,7 +505,7 @@ Py_DEPRECATED(3.11) typedef int UsingDeprecatedTrashcanMacro; #define Py_TRASHCAN_SAFE_BEGIN(op) \ do { \ UsingDeprecatedTrashcanMacro cond=1; \ - Py_TRASHCAN_BEGIN_CONDITION(op, cond); + Py_TRASHCAN_BEGIN_CONDITION((op), cond); #define Py_TRASHCAN_SAFE_END(op) \ Py_TRASHCAN_END; \ } while(0); |