aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2019-07-01 13:37:06 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2019-07-01 13:37:06 +0000
commit9d8aaa4e00958418c01a4aee5a08261108eaf997 (patch)
tree8f0b9daed4376b3da593b9c85bb8cdf7c9ea3340 /gcc
parent397348b919d12c643071ebf0ef79b2c663682523 (diff)
downloadgcc-9d8aaa4e00958418c01a4aee5a08261108eaf997.zip
gcc-9d8aaa4e00958418c01a4aee5a08261108eaf997.tar.gz
gcc-9d8aaa4e00958418c01a4aee5a08261108eaf997.tar.bz2
[Ada] Remove a SPARK rule about implicit Global
A rule about implicit Global contract for functions whose names overload an abstract state was never implemented (and no user complained about this). It is now removed, so references to other rules need to be renumbered. 2019-07-01 Piotr Trojanek <trojanek@adacore.com> gcc/ada/ * einfo.adb, sem_ch7.adb, sem_prag.adb, sem_util.adb: Update references to the SPARK RM after the removal of Rule 7.1.4(5). From-SVN: r272875
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/einfo.adb4
-rw-r--r--gcc/ada/sem_ch7.adb2
-rw-r--r--gcc/ada/sem_prag.adb2
-rw-r--r--gcc/ada/sem_util.adb2
5 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8ac9f48..65ca1e6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
2019-07-01 Piotr Trojanek <trojanek@adacore.com>
+ * einfo.adb, sem_ch7.adb, sem_prag.adb, sem_util.adb: Update
+ references to the SPARK RM after the removal of Rule 7.1.4(5).
+
+2019-07-01 Piotr Trojanek <trojanek@adacore.com>
+
* sysdep.c: Cleanup references to LynuxWorks in docs and
comments.
diff --git a/gcc/ada/einfo.adb b/gcc/ada/einfo.adb
index 13f381d..b9a9a8d 100644
--- a/gcc/ada/einfo.adb
+++ b/gcc/ada/einfo.adb
@@ -8141,7 +8141,7 @@ package body Einfo is
function Is_External_State (Id : E) return B is
begin
-- To qualify, the abstract state must appear with option "external" or
- -- "synchronous" (SPARK RM 7.1.4(8) and (10)).
+ -- "synchronous" (SPARK RM 7.1.4(7) and (9)).
return
Ekind (Id) = E_Abstract_State
@@ -8319,7 +8319,7 @@ package body Einfo is
function Is_Synchronized_State (Id : E) return B is
begin
-- To qualify, the abstract state must appear with simple option
- -- "synchronous" (SPARK RM 7.1.4(10)).
+ -- "synchronous" (SPARK RM 7.1.4(9)).
return
Ekind (Id) = E_Abstract_State
diff --git a/gcc/ada/sem_ch7.adb b/gcc/ada/sem_ch7.adb
index c6095ef..2ed2746 100644
--- a/gcc/ada/sem_ch7.adb
+++ b/gcc/ada/sem_ch7.adb
@@ -3253,7 +3253,7 @@ package body Sem_Ch7 is
-- A [generic] package that defines at least one non-null abstract state
-- requires a completion only when at least one other construct requires
- -- a completion in a body (SPARK RM 7.1.4(4) and (6)). This check is not
+ -- a completion in a body (SPARK RM 7.1.4(4) and (5)). This check is not
-- performed if the caller requests this behavior.
if Do_Abstract_States
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 200e5db..b6d259f 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -12219,7 +12219,7 @@ package body Sem_Prag is
Check_Ghost_Synchronous;
-- Option Part_Of without an encapsulating state is
- -- illegal (SPARK RM 7.1.4(9)).
+ -- illegal (SPARK RM 7.1.4(8)).
elsif Chars (Opt) = Name_Part_Of then
SPARK_Msg_N
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 13a06cc..50ea52a 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -10737,7 +10737,7 @@ package body Sem_Util is
-- Asynch_Writers Effective_Writes
--
-- Note that both forms of External have higher precedence than
- -- Synchronous (SPARK RM 7.1.4(10)).
+ -- Synchronous (SPARK RM 7.1.4(9)).
elsif Has_Synchronous then
return Nam_In (Property, Name_Async_Readers, Name_Async_Writers);