* [Ada] Another small adjustment to System.Value_R
@ 2020-12-16 13:15 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2020-12-16 13:15 UTC (permalink / raw)
To: gcc-patches; +Cc: Eric Botcazou
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
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.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1991 bytes --]
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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-12-16 13:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-16 13:15 [Ada] Another small adjustment to System.Value_R Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).