summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2022-04-04 23:16:53 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2022-05-18 08:41:03 +0000
commit7c77ec1199c3a3d1ac48c9d963b8389c10a2a5bf (patch)
tree904bee0edef98e3888ec13167fc9078842cac055
parentba89624e938a9309a0a8a672b2753159cf0a8a78 (diff)
downloadgcc-7c77ec1199c3a3d1ac48c9d963b8389c10a2a5bf.tar.gz
[Ada] Fix problematic underflow for Float_Type'Value
We need a couple of guards for boundary conditions in the support code. gcc/ada/ * libgnat/s-dourea.adb ("/"): Add guard for zero and infinite divisor. * libgnat/s-valuer.adb (Scan_Raw_Real): Add guard for very large exponent values.
-rw-r--r--gcc/ada/libgnat/s-dourea.adb12
-rw-r--r--gcc/ada/libgnat/s-valuer.adb9
2 files changed, 20 insertions, 1 deletions
diff --git a/gcc/ada/libgnat/s-dourea.adb b/gcc/ada/libgnat/s-dourea.adb
index a6cf2a1ca0b..4f378d6cb6d 100644
--- a/gcc/ada/libgnat/s-dourea.adb
+++ b/gcc/ada/libgnat/s-dourea.adb
@@ -178,6 +178,12 @@ package body System.Double_Real is
P, R : Double_T;
begin
+ if Is_Infinity (B) or else Is_Zero (B) then
+ return (A.Hi / B, 0.0);
+ end if;
+ pragma Annotate (CodePeer, Intentional, "test always false",
+ "code deals with infinity");
+
Q1 := A.Hi / B;
-- Compute R = A - B * Q1
@@ -196,6 +202,12 @@ package body System.Double_Real is
R, S : Double_T;
begin
+ if Is_Infinity (B.Hi) or else Is_Zero (B.Hi) then
+ return (A.Hi / B.Hi, 0.0);
+ end if;
+ pragma Annotate (CodePeer, Intentional, "test always false",
+ "code deals with infinity");
+
Q1 := A.Hi / B.Hi;
R := A - B * Q1;
diff --git a/gcc/ada/libgnat/s-valuer.adb b/gcc/ada/libgnat/s-valuer.adb
index 4b4e8873c3e..b474f8429e5 100644
--- a/gcc/ada/libgnat/s-valuer.adb
+++ b/gcc/ada/libgnat/s-valuer.adb
@@ -645,7 +645,14 @@ package body System.Value_R is
Ptr.all := Index;
Scan_Exponent (Str, Ptr, Max, Expon, Real => True);
- Scale := Scale + Expon;
+
+ -- Handle very large exponents like Scan_Exponent
+
+ if Expon < Integer'First / 10 or else Expon > Integer'Last / 10 then
+ Scale := Expon;
+ else
+ Scale := Scale + Expon;
+ end if;
-- Here is where we check for a bad based number