diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/hooks.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index eed74500f7..17fbe55b5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-10-15 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #22052] + * malloc/hooks.c (realloc_check): Use DIAG_IGNORE_NEEDS_COMMENT + to silence -O3 -Wall warning with GCC 7. + 2017-10-14 H.J. Lu <hongjiu.lu@intel.com> * Makeconfig (+link-static-before-libc): Use the first of diff --git a/malloc/hooks.c b/malloc/hooks.c index 01be076f5e..17d8907727 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -345,11 +345,18 @@ realloc_check (void *oldmem, size_t bytes, const void *caller) newmem = _int_realloc (&main_arena, oldp, oldsize, nb); } + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + /* GCC 7 warns about magic_p may be used uninitialized. But we never + reach here if magic_p is uninitialized. */ + DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized"); +#endif /* mem2chunk_check changed the magic byte in the old chunk. If newmem is NULL, then the old chunk will still be used though, so we need to invert that change here. */ if (newmem == NULL) *magic_p ^= 0xFF; + DIAG_POP_NEEDS_COMMENT; __libc_lock_unlock (main_arena.mutex); |