diff mbox series

[COMMITTED] ada: Update annotations in runtime for proof

Message ID 20230620074650.1252499-1-poulhies@adacore.com
State Unresolved
Headers
Series [COMMITTED] ada: Update annotations in runtime for proof |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Marc Poulhiès June 20, 2023, 7:46 a.m. UTC 
  From: Yannick Moy <moy@adacore.com>

With bump of stable SPARK used for proof of the runtime,
some annotations need to change.

gcc/ada/

	* libgnat/s-aridou.adb (Scaled_Divide): Add assertions.
	* libgnat/s-valuti.adb: Add Loop_Variant.
	* libgnat/s-valuti.ads: Add Exceptional_Cases on No_Return
	procedure.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/libgnat/s-aridou.adb | 11 +++++++++++
 gcc/ada/libgnat/s-valuti.adb |  2 ++
 gcc/ada/libgnat/s-valuti.ads |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gcc/ada/libgnat/s-aridou.adb b/gcc/ada/libgnat/s-aridou.adb
index 66ace8071ff..831590ce387 100644
--- a/gcc/ada/libgnat/s-aridou.adb
+++ b/gcc/ada/libgnat/s-aridou.adb
@@ -2580,8 +2580,19 @@  is
             pragma Assert
               (Big (Double_Uns (Hi (T2))) + Big (Double_Uns (Hi (T1))) =
                    Big (Double_Uns (D (1))));
+            pragma Assert
+              (Is_Mult_Decomposition (D1 => Big (Double_Uns (D (1))),
+                                      D2 => Big (Double_Uns (D (2))),
+                                      D3 => Big (Double_Uns (D (3))),
+                                      D4 => Big (Double_Uns (D (4)))));
          else
             D (1) := 0;
+
+            pragma Assert
+              (Is_Mult_Decomposition (D1 => Big (Double_Uns (D (1))),
+                                      D2 => Big (Double_Uns (D (2))),
+                                      D3 => Big (Double_Uns (D (3))),
+                                      D4 => Big (Double_Uns (D (4)))));
          end if;
 
       else
diff --git a/gcc/ada/libgnat/s-valuti.adb b/gcc/ada/libgnat/s-valuti.adb
index ec6fdb03225..ee37c1a636b 100644
--- a/gcc/ada/libgnat/s-valuti.adb
+++ b/gcc/ada/libgnat/s-valuti.adb
@@ -123,6 +123,7 @@  is
       while F < L and then S (F) = ' ' loop
          pragma Loop_Invariant (F in S'First .. L - 1);
          pragma Loop_Invariant (for all J in S'First .. F => S (J) = ' ');
+         pragma Loop_Variant (Increases => F);
          F := F + 1;
       end loop;
 
@@ -139,6 +140,7 @@  is
       while S (L) = ' ' loop
          pragma Loop_Invariant (L in F + 1 .. S'Last);
          pragma Loop_Invariant (for all J in L .. S'Last => S (J) = ' ');
+         pragma Loop_Variant (Decreases => L);
          L := L - 1;
       end loop;
 
diff --git a/gcc/ada/libgnat/s-valuti.ads b/gcc/ada/libgnat/s-valuti.ads
index 1faa6471d0d..22d0612bc32 100644
--- a/gcc/ada/libgnat/s-valuti.ads
+++ b/gcc/ada/libgnat/s-valuti.ads
@@ -51,7 +51,8 @@  is
 
    procedure Bad_Value (S : String)
    with
-     Depends => (null => S);
+     Depends => (null => S),
+     Exceptional_Cases => (others => Standard.False);
    pragma No_Return (Bad_Value);
    --  Raises constraint error with message: bad input for 'Value: "xxx"