From: Paul Eggert <eggert@cs.ucla.edu> Date: Tue, 19 Nov 2019 17:44:02 +0000 (-0800) Subject: * lib/intprops.h (INT_MULTIPLY_WRAPV): Simplify gcc -E output. X-Git-Tag: v1.0~4590 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=a4740cc6fa277fb41aab06563657458e03ab0346;p=gnulib.git * lib/intprops.h (INT_MULTIPLY_WRAPV): Simplify gcc -E output. --- diff --git a/lib/intprops.h b/lib/intprops.h index 6a49c5ad4f..d0c2d706d9 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -373,13 +373,16 @@ _GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW) #endif #if _GL_HAS_BUILTIN_MUL_OVERFLOW -/* Work around GCC bug 91450 (fixed in GCC 9.3). */ -# define INT_MULTIPLY_WRAPV(a, b, r) \ - ((! (9 < __GNUC__ + (3 <= __GNUC_MINOR__)) \ - && !_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \ - && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ - ? ((void) __builtin_mul_overflow (a, b, r), 1) \ - : __builtin_mul_overflow (a, b, r)) +# if 9 < __GNUC__ + (3 <= __GNUC_MINOR__) +# define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r) +# else + /* Work around GCC bug 91450. */ +# define INT_MULTIPLY_WRAPV(a, b, r) \ + ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \ + && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \ + ? ((void) __builtin_mul_overflow (a, b, r), 1) \ + : __builtin_mul_overflow (a, b, r)) +# endif #else # define INT_MULTIPLY_WRAPV(a, b, r) \ _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW)