From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 02BE83858291; Mon, 29 Jan 2024 17:57:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02BE83858291 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706551022; bh=52LJXrQZvzLkpBVDJDyiVrPtPQtfsO9wLpAresxE8rM=; h=From:To:Subject:Date:From; b=YljwlrmRq1kWHWh+TVNFUBq5T+a2+gVcNHslkmGJ4dg+n6NyLGC5AZcP4Z6Cwspc2 op5YMwKNbu6cRzh3ehEmx6jQtnwI4kozQWyI1V7glwAKnTm86R646XlU9YzBlbUc/I ONPwzBMViEcQBJYr2TEQwtwK/AAZlBmvYXIuMKcM= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] stdlib: Only enable strtod_l asserts if SIZE_MAX == UINTMAX_MAX X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 19116f77df39a16d3415c744167acb6d27ef71c4 X-Git-Newrev: 811e31142befc0500ca547256540abf97dc21a61 Message-Id: <20240129175702.02BE83858291@sourceware.org> Date: Mon, 29 Jan 2024 17:57:01 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=811e31142befc0500ca547256540abf97dc21a61 commit 811e31142befc0500ca547256540abf97dc21a61 Author: Adhemerval Zanella Date: Tue Jul 26 08:38:48 2022 -0300 stdlib: Only enable strtod_l asserts if SIZE_MAX == UINTMAX_MAX clang on 32 bits where size_t is smaller than intmax_t emits: strtod_l.c:874:18: error: result of comparison of constant 9223372036854775807 with expression of type 'size_t' (aka 'unsigned int') is always true [-Werror,-Wtautological-constant-out-of-range-compare] assert (dig_no <= (uintmax_t) INTMAX_MAX); ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~ ../assert/assert.h:106:11: note: expanded from macro 'assert' if (expr) \ ^~~~ So only enable the assert iff SIZE_MAX == UINTMAX_MAX. Diff: --- stdlib/strtod_l.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c index be515ce659..d271ed0034 100644 --- a/stdlib/strtod_l.c +++ b/stdlib/strtod_l.c @@ -871,7 +871,10 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, c = *++cp; } } + +#if SIZE_MAX == UINTMAX_MAX assert (dig_no <= (uintmax_t) INTMAX_MAX); +#endif /* Remember start of exponent (if any). */ expp = cp; @@ -901,16 +904,20 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, { if (exp_negative) { +#if SIZE_MAX == UINTMAX_MAX assert (int_no <= (uintmax_t) (INTMAX_MAX + MIN_EXP - MANT_DIG) / 4); +#endif exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no; } else { if (int_no) { +#if SIZE_MAX == UINTMAX_MAX assert (lead_zero == 0 && int_no <= (uintmax_t) INTMAX_MAX / 4); +#endif exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3; } else if (lead_zero == (size_t) -1) @@ -921,8 +928,10 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, } else { +#if SIZE_MAX == UINTMAX_MAX assert (lead_zero <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4); +#endif exp_limit = (MAX_EXP + 4 * (intmax_t) lead_zero + 3); @@ -933,16 +942,20 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, { if (exp_negative) { +#if SIZE_MAX == UINTMAX_MAX assert (int_no <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG)); +#endif exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no; } else { if (int_no) { +#if SIZE_MAX == UINTMAX_MAX assert (lead_zero == 0 && int_no <= (uintmax_t) INTMAX_MAX); +#endif exp_limit = MAX_10_EXP - (intmax_t) int_no + 1; } else if (lead_zero == (size_t) -1) @@ -953,8 +966,10 @@ ____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, } else { +#if SIZE_MAX == UINTMAX_MAX assert (lead_zero <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1)); +#endif exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1; } }