From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTP id 11A5C3851C21 for ; Wed, 16 Dec 2020 13:15:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 11A5C3851C21 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id C8FDE561FD; Wed, 16 Dec 2020 08:15:34 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id IdH-1WOXKYaf; Wed, 16 Dec 2020 08:15:34 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id B5A63561FB; Wed, 16 Dec 2020 08:15:34 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id B4ADFA6; Wed, 16 Dec 2020 08:15:34 -0500 (EST) Date: Wed, 16 Dec 2020 08:15:34 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [Ada] Another small adjustment to System.Value_R Message-ID: <20201216131534.GA69687@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="NzB8fVQJ5HfG6fxh" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2020 13:15:36 -0000 --NzB8fVQJ5HfG6fxh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This makes the code more explicit for the sake of static analyzers. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/s-valuer.adb (Scan_Decimal_Digits): Tweak overflow test. (Scan_Integral_Digits): Likewise. --NzB8fVQJ5HfG6fxh Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/libgnat/s-valuer.adb b/gcc/ada/libgnat/s-valuer.adb --- a/gcc/ada/libgnat/s-valuer.adb +++ b/gcc/ada/libgnat/s-valuer.adb @@ -236,12 +236,15 @@ package body System.Value_R is Temp := Value * Uns (Base) + Uns (Digit); -- Check if Temp is larger than Precision_Limit, taking into - -- account that Temp may have wrapped around. + -- account that Temp may wrap around when Precision_Limit is + -- equal to the largest integer. if Value <= Umax or else (Value <= UmaxB - and then Temp <= Precision_Limit - and then Temp >= Uns (Base)) + and then ((Precision_Limit < Uns'Last + and then Temp <= Precision_Limit) + or else (Precision_Limit = Uns'Last + and then Temp >= Uns (Base)))) then Value := Temp; Scale := Scale - 1; @@ -386,12 +389,15 @@ package body System.Value_R is Temp := Value * Uns (Base) + Uns (Digit); -- Check if Temp is larger than Precision_Limit, taking into - -- account that Temp may have wrapped around. + -- account that Temp may wrap around when Precision_Limit is + -- equal to the largest integer. if Value <= Umax or else (Value <= UmaxB - and then Temp <= Precision_Limit - and then Temp >= Uns (Base)) + and then ((Precision_Limit < Uns'Last + and then Temp <= Precision_Limit) + or else (Precision_Limit = Uns'Last + and then Temp >= Uns (Base)))) then Value := Temp; --NzB8fVQJ5HfG6fxh--