[Ada] SPARK_Mode Off now allowed inside subprogram

The rule on SPARK_Mode have been modified so that it is now possible to
have a subprogram or package declared with SPARK_Mode Off inside a
subprogram.

2019-07-04  Yannick Moy  <moy@adacore.com>

gcc/ada/

	* sem_prag.adb (Check_Library_Level_Entity): Update for new rule
	on SPARK_Mode.

gcc/testsuite/

	* gnat.dg/spark3.adb: New testcase.

From-SVN: r273064

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e476413feb77e9e20c9dd6215d2e0b126771e642..f5c29272e63a360775195baa332be9c2e5e7e57d 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+       * sem_prag.adb (Check_Library_Level_Entity): Update for new rule
+       on SPARK_Mode.
+
 2019-07-04  Justin Squirek  <squirek@adacore.com>
 
        * sem_disp.adb (Check_Controlling_Formals): Obtain the full view

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index b499dbd158400e4aaca2710bb16acbb8188483dc..d8414269d5bb18be3b00a56106a6d2bf1f207fcd 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -23189,7 +23189,16 @@ package body Sem_Prag is
             --  Start of processing for Check_Library_Level_Entity
 
             begin
-               if not Is_Library_Level_Entity (E) then
+               --  A SPARK_Mode of On shall only apply to library-level
+               --  entities, except for those in generic instances, which are
+               --  ignored (even if the entity gets SPARK_Mode pragma attached
+               --  in the AST, its effect is not taken into account unless the
+               --  context already provides SPARK_Mode of On in GNATprove).
+
+               if Get_SPARK_Mode_From_Annotation (N) = On
+                 and then not Is_Library_Level_Entity (E)
+                 and then Instantiation_Location (Sloc (N)) = No_Location
+               then
                   Error_Msg_Name_1 := Pname;
                   Error_Msg_N (Fix_Error (Msg_1), N);
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6873356c469f2854cf359858c9506ae5ef78da83..3502e68ffcec2bb39d31068908da9400cb7c1ce8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-04  Yannick Moy  <moy@adacore.com>
+
+       * gnat.dg/spark3.adb: New testcase.
+
 2019-07-04  Justin Squirek  <squirek@adacore.com>
 
        * gnat.dg/tagged2.adb, gnat.dg/tagged2.ads: New testcase.

diff --git a/gcc/testsuite/gnat.dg/spark3.adb b/gcc/testsuite/gnat.dg/spark3.adb
new file mode 100644 (file)
index 0000000..3c9908a
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/spark3.adb
@@ -0,0 +1,20 @@
+--  { dg-do compile }
+
+procedure SPARK3 (X : in out Integer) with SPARK_Mode is
+
+   procedure Q (X : in out Integer) with SPARK_Mode => Off is
+   begin
+      X := X + 1;
+   end Q;
+
+   procedure R (X : in out Integer);
+
+   procedure R (X : in out Integer) with SPARK_Mode => Off is
+   begin
+      Q (X);
+   end R;
+
+begin
+   R (X);
+   X := X + 1;
+end SPARK3;