diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-08-11 15:48:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-11 15:48:14 +0200 |
| commit | 2aa1a7a8f8b9b7879bc6eb1c34d1580f992c406d (patch) | |
| tree | cf241b617886bb101487e589371f8e84d9e16e66 | |
| parent | c55ad6452e2d63ebf6fcaabb00bfd27aae02ffb6 (diff) | |
| download | glibc-2aa1a7a8f8b9b7879bc6eb1c34d1580f992c406d.tar glibc-2aa1a7a8f8b9b7879bc6eb1c34d1580f992c406d.tar.gz glibc-2aa1a7a8f8b9b7879bc6eb1c34d1580f992c406d.tar.bz2 glibc-2aa1a7a8f8b9b7879bc6eb1c34d1580f992c406d.zip | |
assert: Suppress pedantic warning caused by statement expression [BZ #21242]
(cherry picked from commit 8b2c63e4e2ad1fd161f80004ed30624f2a37b57b)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | assert/assert.h | 12 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2017-08-11 Florian Weimer <fweimer@redhat.com> + + [BZ #21242] + * assert/assert.h [__GNUC__ && !__STRICT_ANSI__] (assert): + Suppress pedantic warning resulting from statement expression. + (__ASSERT_FUNCTION): Add missing __extension__. + 2017-08-10 Florian Weimer <fweimer@redhat.com> * malloc/malloc.c (get_max_fast): Reimplement as an inline @@ -9,6 +9,7 @@ Version 2.26.1 The following bugs are resolved with this release: + [21242] assert: Suppress pedantic warning caused by statement expression [21885] getaddrinfo: Release resolver context on error in gethosts [21932] Unpaired __resolv_context_get in generic get*_r implementation diff --git a/assert/assert.h b/assert/assert.h index 22f019537c..6801cfeb10 100644 --- a/assert/assert.h +++ b/assert/assert.h @@ -91,13 +91,19 @@ __END_DECLS ? __ASSERT_VOID_CAST (0) \ : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION)) # else +/* The first occurrence of EXPR is not evaluated due to the sizeof, + but will trigger any pedantic warnings masked by the __extension__ + for the second occurrence. The explicit comparison against zero is + required to support function pointers and bit fields in this + context, and to suppress the evaluation of variable length + arrays. */ # define assert(expr) \ - ({ \ + ((void) sizeof ((expr) == 0), __extension__ ({ \ if (expr) \ ; /* empty */ \ else \ __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION); \ - }) + })) # endif # ifdef __USE_GNU @@ -113,7 +119,7 @@ __END_DECLS C9x has a similar variable called __func__, but prefer the GCC one since it demangles C++ function names. */ # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) -# define __ASSERT_FUNCTION __PRETTY_FUNCTION__ +# define __ASSERT_FUNCTION __extension__ __PRETTY_FUNCTION__ # else # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L # define __ASSERT_FUNCTION __func__ |