system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

malloc: Avoid optimizer warning with GCC 7 and -O3

Browse Source
This commit is contained in:
Florian Weimer 2017-08-10 15:58:28 +02:00
parent bd80111ed9
commit eac43cbb8d
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-08-10 Florian Weimer <fweimer@redhat.com>
* malloc/malloc.c (get_max_fast): Reimplement as an inline
function which calls __builtin_unreachable.
2017-08-10 Mike FABIAN <mfabian@redhat.com> 2017-08-10 Mike FABIAN <mfabian@redhat.com>
* stdlib/tst-strfmon_l.c: Fix test cases to agree with the changes in * stdlib/tst-strfmon_l.c: Fix test cases to agree with the changes in

20
malloc/malloc.c
View File

@ -1658,6 +1658,9 @@ typedef struct malloc_chunk *mfastbinptr;
#define arena_is_corrupt(A) (((A)->flags & ARENA_CORRUPTION_BIT)) #define arena_is_corrupt(A) (((A)->flags & ARENA_CORRUPTION_BIT))
#define set_arena_corrupt(A) ((A)->flags |= ARENA_CORRUPTION_BIT) #define set_arena_corrupt(A) ((A)->flags |= ARENA_CORRUPTION_BIT)
/* Maximum size of memory handled in fastbins. */
static INTERNAL_SIZE_T global_max_fast;
/* /*
Set value of max_fast. Set value of max_fast.
Use impossibly small value if 0. Use impossibly small value if 0.
@ -1668,8 +1671,20 @@ typedef struct malloc_chunk *mfastbinptr;
#define set_max_fast(s) \ #define set_max_fast(s) \
global_max_fast = (((s) == 0) \ global_max_fast = (((s) == 0) \
? SMALLBIN_WIDTH : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK)) ? SMALLBIN_WIDTH : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
#define get_max_fast() global_max_fast
static inline INTERNAL_SIZE_T
get_max_fast (void)
{
/* Tell the GCC optimizers that global_max_fast is never larger
than MAX_FAST_SIZE. This avoids out-of-bounds array accesses in
_int_malloc after constant propagation of the size parameter.
(The code never executes because malloc preserves the
global_max_fast invariant, but the optimizers may not recognize
this.) */
if (global_max_fast > MAX_FAST_SIZE)
__builtin_unreachable ();
return global_max_fast;
}
/* /*
----------- Internal state representation and initialization ----------- ----------- Internal state representation and initialization -----------
@ -1797,9 +1812,6 @@ static struct malloc_par mp_ =
#endif #endif
}; };
/* Maximum size of memory handled in fastbins. */
static INTERNAL_SIZE_T global_max_fast;
/* /*
Initialize a malloc_state struct. Initialize a malloc_state struct.