diff mbox series

[Ada] Fix problematic underflow for Float_Type'Value

Message ID 20220518084312.GA3326542@adacore.com
State Committed
Commit 7c77ec1199c3a3d1ac48c9d963b8389c10a2a5bf
Headers
Series [Ada] Fix problematic underflow for Float_Type'Value |

Commit Message

Pierre-Marie de Rodat May 18, 2022, 8:43 a.m. UTC 
  We need a couple of guards for boundary conditions in the support code.

Tested on x86_64-pc-linux-gnu, committed on trunk

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.
diff mbox series

Patch

diff --git a/gcc/ada/libgnat/s-dourea.adb b/gcc/ada/libgnat/s-dourea.adb
--- 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
--- 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