OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes] 

2015-10-23  Gary Dismukes  <dismukes@adacore.com>

	* bindgen.adb, restrict.adb: Minor spelling/grammar fixes.

2015-10-23  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_res.adb (Resolve_Entity_Name): Code cleanup. Check for possible
	elaboration issues in SPARK when the name denotes a source variable.

From-SVN: r229228
This commit is contained in:
Arnaud Charlet 2015-10-23 12:44:35 +02:00
parent 6e84098973
commit ed37f25a36
4 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ada/ChangeLog
View File

@ -1,3 +1,12 @@
2015-10-23 Gary Dismukes <dismukes@adacore.com>
* bindgen.adb, restrict.adb: Minor spelling/grammar fixes.
2015-10-23 Hristian Kirtchev <kirtchev@adacore.com>
* sem_res.adb (Resolve_Entity_Name): Code cleanup. Check for possible
elaboration issues in SPARK when the name denotes a source variable.
2015-10-23 Hristian Kirtchev <kirtchev@adacore.com>
* exp_ch7.adb (Process_Transient_Objects): Reimplement to properly

4
gcc/ada/bindgen.adb
View File

@ -2810,8 +2810,8 @@ package body Bindgen is
procedure Check_Package (Var : in out Boolean; Name : String);
-- Set Var to true iff the current identifier in Namet is Name. Do
-- nothing if it doesn't match. This procedure is just an helper to
-- avoid to explicitely deal with length.
-- nothing if it doesn't match. This procedure is just a helper to
-- avoid explicitly dealing with length.
-------------------
-- Check_Package --

2
gcc/ada/restrict.adb
View File

@ -503,7 +503,7 @@ package body Restrict is
-- so that we have consistency between each compilation.
-- In GNATprove mode restrictions are checked, except for
-- No_Initialize_Scalars, which is implicitely set in gnat1drv.adb.
-- No_Initialize_Scalars, which is implicitly set in gnat1drv.adb.
-- Just checking, SPARK does not allow restrictions to be set ???

58
gcc/ada/sem_res.adb
View File

@ -7179,44 +7179,40 @@ package body Sem_Res is
Par := Parent (Par);
end if;
-- The following checks are only relevant when SPARK_Mode is on as they
-- are not standard Ada legality rules. An effectively volatile object
-- subject to enabled properties Async_Writers or Effective_Reads must
-- appear in a specific context.
if Comes_From_Source (N) then
if SPARK_Mode = On
and then Is_Object (E)
and then Is_Effectively_Volatile (E)
and then (Async_Writers_Enabled (E)
or else Effective_Reads_Enabled (E))
and then Comes_From_Source (N)
then
-- The effectively volatile objects appears in a "non-interfering
-- context" as defined in SPARK RM 7.1.3(12).
-- The following checks are only relevant when SPARK_Mode is on as
-- they are not standard Ada legality rules.
if Is_OK_Volatile_Context (Par, N) then
null;
if SPARK_Mode = On then
-- Otherwise the context causes a side effect with respect to the
-- effectively volatile object.
-- An effectively volatile object subject to enabled properties
-- Async_Writers or Effective_Reads must appear in non-interfering
-- context (SPARK RM 7.1.3(12)).
else
SPARK_Msg_N
("volatile object cannot appear in this context "
& "(SPARK RM 7.1.3(12))", N);
if Is_Object (E)
and then Is_Effectively_Volatile (E)
and then (Async_Writers_Enabled (E)
or else Effective_Reads_Enabled (E))
and then not Is_OK_Volatile_Context (Par, N)
then
SPARK_Msg_N
("volatile object cannot appear in this context "
& "(SPARK RM 7.1.3(12))", N);
end if;
-- Check possible elaboration issues with respect to variables
if Ekind (E) = E_Variable then
Check_Elab_Call (N);
end if;
end if;
end if;
-- A Ghost entity must appear in a specific context
-- A Ghost entity must appear in a specific context
if Is_Ghost_Entity (E) and then Comes_From_Source (N) then
Check_Ghost_Context (E, N);
end if;
-- In SPARK mode, need to check possible elaboration issues
if SPARK_Mode = On and then Ekind (E) = E_Variable then
Check_Elab_Call (N);
if Is_Ghost_Entity (E) then
Check_Ghost_Context (E, N);
end if;
end if;
end Resolve_Entity_Name;