* [COMMITTED] ada: Use ghost predicate in standard library
@ 2023-06-13 7:37 Marc Poulhiès
0 siblings, 0 replies; only message in thread
From: Marc Poulhiès @ 2023-06-13 7:37 UTC (permalink / raw)
To: gcc-patches; +Cc: Yannick Moy
From: Yannick Moy <moy@adacore.com>
In preparation for attribute Initialized to become ghost, use aspect
Ghost_Predicate instead of Predicate in unit Ada.Strings.Superbounded
of the standard library.
gcc/ada/
* libgnat/a-strsup.ads: Change predicate aspect.
* sem_ch13.adb (Add_Predicate): Fix for first predicate.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/libgnat/a-strsup.ads | 2 +-
gcc/ada/sem_ch13.adb | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gcc/ada/libgnat/a-strsup.ads b/gcc/ada/libgnat/a-strsup.ads
index 7a8a2bac996..2e0cd98f8d4 100644
--- a/gcc/ada/libgnat/a-strsup.ads
+++ b/gcc/ada/libgnat/a-strsup.ads
@@ -69,7 +69,7 @@ package Ada.Strings.Superbounded with SPARK_Mode is
-- Leaving it out is more efficient.
end record
with
- Predicate =>
+ Ghost_Predicate =>
Current_Length <= Max_Length
and then Data (1 .. Current_Length)'Initialized,
Put_Image => Put_Image;
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 32771f06d76..2b8b64aa392 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -10101,9 +10101,13 @@ package body Sem_Ch13 is
-- Start of processing for Add_Predicate
begin
- -- A ghost predicate is checked only when Ghost mode is enabled
+ -- A ghost predicate is checked only when Ghost mode is enabled.
+ -- Add a condition for the presence of a predicate to be recorded,
+ -- which is needed to generate the corresponding predicate
+ -- function.
if Is_Ignored_Ghost_Pragma (Prag) then
+ Add_Condition (New_Occurrence_Of (Standard_True, Sloc (Prag)));
return;
end if;
--
2.40.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-13 7:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-13 7:37 [COMMITTED] ada: Use ghost predicate in standard library Marc Poulhiès
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).