Commit 92a50102 authored by Paul Eggert's avatar Paul Eggert

Merge from gnulib

This incorporates:
2015-11-13 xalloc-oversized: improve performance with GCC 5
* lib/xalloc-oversized.h: Copy from gnulib.
parent 04ac097f
......@@ -16,9 +16,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef XALLOC_OVERSIZED_H_
# define XALLOC_OVERSIZED_H_
#define XALLOC_OVERSIZED_H_
# include <stddef.h>
#include <stddef.h>
#ifndef __has_builtin
# define __has_builtin(x) 0
#endif
/* Return 1 if an array of N objects, each of size S, cannot exist due
to size arithmetic overflow. S must be positive and N must be
......@@ -32,7 +36,12 @@
sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
exactly-SIZE_MAX allocations on such hosts; this avoids a test and
branch when S is known to be 1. */
#if 5 <= __GNUC__ || __has_builtin (__builtin_mul_overflow)
# define xalloc_oversized(n, s) \
({ size_t __xalloc_size; __builtin_mul_overflow (n, s, &__xalloc_size); })
#else
# define xalloc_oversized(n, s) \
((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
#endif
#endif /* !XALLOC_OVERSIZED_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment