diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-25 14:55:43 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-02-25 14:55:43 +0000 |
commit | f9bcba0dbebe716f61974fb12a15a45d86419c97 (patch) | |
tree | 2abdbf5c5cdcda0ae03817cfa833ccdd8485cbb7 /gcc/ada/sem_ch3.adb | |
parent | 27c92dd144847cc1c342e79f57d03cff39fed3b4 (diff) | |
download | gcc-f9bcba0dbebe716f61974fb12a15a45d86419c97.tar.gz |
2014-02-25 Yannick Moy <moy@adacore.com>
* sem_ch3.adb, sem_ch5.adb, sem_ch9.adb, sem_prag.adb, sem_attr.adb,
sem_ch6.adb: Remove useless references to SPARK RM in error messages.
2014-02-25 Hristian Kirtchev <kirtchev@adacore.com>
* sem_res.adb (Appears_In_Check): New routine.
(Resolve_Entity_Name): Remove local variables Prev and
Usage_OK. Par is now a constant. Remove the parent chain traversal
as the placement of a volatile object with enabled property
Async_Writers and/or Effective_Reads must appear immediately
within a legal construct.
2014-02-25 Hristian Kirtchev <kirtchev@adacore.com>
* checks.adb (Apply_Selected_Range_Checks):
Alphabetize local constants and variables. Add comments.
Always insert a range check that requires runtime evaluation into
the tree.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208128 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sem_ch3.adb')
-rw-r--r-- | gcc/ada/sem_ch3.adb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 1c114734560..358bc359a69 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -2992,14 +2992,13 @@ package body Sem_Ch3 is -- A constant cannot be volatile. This check is only relevant when -- SPARK_Mode is on as it is not standard Ada legality rule. Do not -- flag internally-generated constants that map generic formals to - -- actuals in instantiations. + -- actuals in instantiations (SPARK RM 7.1.3(6)). if SPARK_Mode = On and then Is_SPARK_Volatile_Object (Obj_Id) and then No (Corresponding_Generic_Association (Parent (Obj_Id))) then - Error_Msg_N - ("constant cannot be volatile (SPARK 'R'M 7.1.3(6))", Obj_Id); + Error_Msg_N ("constant cannot be volatile", Obj_Id); end if; else pragma Assert (Ekind (Obj_Id) = E_Variable); @@ -3010,13 +3009,14 @@ package body Sem_Ch3 is if SPARK_Mode = On then -- A non-volatile object cannot have volatile components + -- (SPARK RM 7.1.3(7)). if not Is_SPARK_Volatile_Object (Obj_Id) and then Has_Volatile_Component (Etype (Obj_Id)) then Error_Msg_N - ("non-volatile variable & cannot have volatile components " - & "(SPARK 'R'M 7.1.3(7))", Obj_Id); + ("non-volatile variable & cannot have volatile components", + Obj_Id); -- The declaration of a volatile object must appear at the library -- level. @@ -18042,13 +18042,13 @@ package body Sem_Ch3 is end if; -- A discriminant cannot be volatile. This check is only relevant - -- when SPARK_Mode is on as it is not standard Ada legality rule. + -- when SPARK_Mode is on as it is not standard Ada legality rule + -- (SPARK RM 7.1.3(6)). if SPARK_Mode = On and then Is_SPARK_Volatile_Object (Defining_Identifier (Discr)) then - Error_Msg_N - ("discriminant cannot be volatile (SPARK 'R'M 7.1.3(6))", Discr); + Error_Msg_N ("discriminant cannot be volatile", Discr); end if; Next (Discr); |