From patchwork Wed Jun 28 16:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 21318 Received: (qmail 65836 invoked by alias); 28 Jun 2017 16:20:37 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 65807 invoked by uid 89); 28 Jun 2017 16:20:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Wed, 28 Jun 2017 16:20:26 +0000 From: Joseph Myers To: Subject: Simplify tgmath.h for integer return types [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) The tgmath.h macros for function with integer return types generate unnecessary casts to the return type. Since in those cases the return type does not depend on the argument type, all the cases in the conditional expressions already have the right type, and no casts are needed; this patch removes them. Tested for x86_64. 2017-06-28 Joseph Myers * math/tgmath.h (__TGMATH_UNARY_REAL_RET_ONLY): Do not take or cast to return type argument. (__TGMATH_TERNARY_FIRST_REAL_RET_ONLY): Likewise. (lrint): Update call to __TGMATH_UNARY_REAL_RET_ONLY. (llrint): Likewise. (lround): Likewise. (llround): Likewise. (ilogb): Likewise. (llogb): Likewise. (fromfp): Update call to __TGMATH_TERNARY_FIRST_REAL_RET_ONLY. (ufromfp): Likewise. (fromfpx): Likewise. (ufromfpx): Likewise. diff --git a/math/tgmath.h b/math/tgmath.h index 01730a4..a70dfe1 100644 --- a/math/tgmath.h +++ b/math/tgmath.h @@ -78,13 +78,13 @@ ? (__tgmath_real_type (Val)) Fct##f (Val) \ : (__tgmath_real_type (Val)) __tgml(Fct) (Val))) -# define __TGMATH_UNARY_REAL_RET_ONLY(Val, RetType, Fct) \ +# define __TGMATH_UNARY_REAL_RET_ONLY(Val, Fct) \ (__extension__ ((sizeof (Val) == sizeof (double) \ || __builtin_classify_type (Val) != 8) \ - ? (RetType) Fct (Val) \ + ? Fct (Val) \ : (sizeof (Val) == sizeof (float)) \ - ? (RetType) Fct##f (Val) \ - : (RetType) __tgml(Fct) (Val))) + ? Fct##f (Val) \ + : __tgml(Fct) (Val))) # define __TGMATH_BINARY_FIRST_REAL_ONLY(Val1, Val2, Fct) \ (__extension__ ((sizeof (Val1) == sizeof (double) \ @@ -155,13 +155,13 @@ + (__tgmath_real_type (Val3)) 0)) \ Fct##f (Val1, Val2, Val3))) -# define __TGMATH_TERNARY_FIRST_REAL_RET_ONLY(Val1, Val2, Val3, RetType, Fct) \ +# define __TGMATH_TERNARY_FIRST_REAL_RET_ONLY(Val1, Val2, Val3, Fct) \ (__extension__ ((sizeof (Val1) == sizeof (double) \ || __builtin_classify_type (Val1) != 8) \ - ? (RetType) Fct (Val1, Val2, Val3) \ + ? Fct (Val1, Val2, Val3) \ : (sizeof (Val1) == sizeof (float)) \ - ? (RetType) Fct##f (Val1, Val2, Val3) \ - : (RetType) __tgml(Fct) (Val1, Val2, Val3))) + ? Fct##f (Val1, Val2, Val3) \ + : __tgml(Fct) (Val1, Val2, Val3))) /* XXX This definition has to be changed as soon as the compiler understands the imaginary keyword. */ @@ -377,13 +377,13 @@ /* Round X to nearest integral value according to current rounding direction. */ -#define lrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long int, lrint) -#define llrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long long int, llrint) +#define lrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, lrint) +#define llrint(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, llrint) /* Round X to nearest integral value, rounding halfway cases away from zero. */ -#define lround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long int, lround) -#define llround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long long int, llround) +#define lround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, lround) +#define llround(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, llround) /* Return X with its signed changed to Y's. */ @@ -428,7 +428,7 @@ __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, scalbln) /* Return the binary exponent of X, which must be nonzero. */ -#define ilogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, int, ilogb) +#define ilogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, ilogb) /* Return positive difference between X and Y. */ @@ -450,19 +450,19 @@ # define roundeven(Val) __TGMATH_UNARY_REAL_ONLY (Val, roundeven) # define fromfp(Val1, Val2, Val3) \ - __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, __intmax_t, fromfp) + __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, fromfp) # define ufromfp(Val1, Val2, Val3) \ - __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, __uintmax_t, ufromfp) + __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, ufromfp) # define fromfpx(Val1, Val2, Val3) \ - __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, __intmax_t, fromfpx) + __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, fromfpx) # define ufromfpx(Val1, Val2, Val3) \ - __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, __uintmax_t, ufromfpx) + __TGMATH_TERNARY_FIRST_REAL_RET_ONLY (Val1, Val2, Val3, ufromfpx) /* Like ilogb, but returning long int. */ -# define llogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, long int, llogb) +# define llogb(Val) __TGMATH_UNARY_REAL_RET_ONLY (Val, llogb) /* Return value with maximum magnitude. */ # define fmaxmag(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmaxmag)