[multiple changes]

2015-10-26  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch6.adb: Handle subprogram bodies without previous specs.

2015-10-26  Claire Dross  <dross@adacore.com>

	* a-nudira.ads: Specify appropriate SPARK_Mode so that the unit
	can be used in SPARK code.

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

	* contracts.adb (Analyze_Subprogram_Body_Contract): Do not analyze
	pragmas Refined_Global and Refined_Depends because these pragmas
	are now fully analyzed when encountered.
	(Inherit_Pragma): Update the call to attribute Is_Inherited.
	* sem_prag.adb (Analyze_Contract_Cases_In_Decl_Part): Add a guard
	to prevent reanalysis. Mark the pragma as analyzed at the end of
	the processing.
	(Analyze_Depends_Global): New parameter profile
	and comment on usage. Do not fully analyze the pragma, this is
	now done at the outer level.
	(Analyze_Depends_In_Decl_Part): Add a guard to prevent reanalysis.
	Mark the pragma as analyzed at the end of the processing.
	(Analyze_External_Property_In_Decl_Part): Add a guard to prevent
	reanalysis.  Mark the pragma as analyzed at the end of the processing.
	(Analyze_Global_In_Decl_Part): Add a guard to prevent reanalysis. Mark
	the pragma as analyzed at the end of the processing.
	(Analyze_Initial_Condition_In_Decl_Part): Add a guard to prevent
	reanalysis.  Mark the pragma as analyzed at the end of the processing.
	(Analyze_Initializes_In_Decl_Part): Add a guard to prevent reanalysis.
	Mark the pragma as analyzed at the end of the processing.
	(Analyze_Pragma): Reset the Analyzed flag on various pragmas that
	require delayed full analysis. Contract_Cases is now analyzed
	immediately when it applies to a subprogram body stub. Pragmas Depends,
	Global, Refined_Depends and Refined_Global are now analyzed
	in pairs when they appear in a subprogram body [stub].
	(Analyze_Pre_Post_Condition_In_Decl_Part): Add a guard to
	prevent reanalysis.  Mark the pragma as analyzed at the end of
	the processing.
	(Analyze_Refined_Depends_Global_Post): Update the comment on usage.
	(Analyze_Refined_Depends_In_Decl_Part): Add a guard to prevent
	reanalysis. Mark the pragma as analyzed at the end of the processing.
	(Analyze_Refined_Global_In_Decl_Part): Add a guard to prevent
	reanalysis. Mark the pragma as analyzed at the end of the processing.
	(Analyze_Refined_State_In_Decl_Part): Add a guard to prevent
	reanalysis. Mark the pragma as analyzed at the end of the processing.
	(Analyze_Test_Case_In_Decl_Part): Add a guard to prevent reanalysis.
	Mark the pragma as analyzed at the end of the processing.
	(Is_Followed_By_Pragma): New routine.
	* sinfo.adb (Is_Analyzed_Pragma): New routine.
	(Is_Inherited): Renamed to Is_Inherited_Pragma.
	(Set_Is_Analyzed_Pragma): New routine.
	(Set_Is_Inherited): Renamed to Set_Is_Inherited_Pragma.
	* sinfo.ads Rename attribute Is_Inherited to Is_Inherited_Pragma
	and update occurrences in nodes.
	(Is_Analyzed_Pragma): New routine along with pragma Inline.
	(Is_Inherited): Renamed to Is_Inherited_Pragma along with pragma Inline.
	(Set_Is_Analyzed_Pragma): New routine along with pragma Inline.
	(Set_Is_Inherited): Renamed to Set_Is_Inherited_Pragma along
	with pragma Inline.

2015-10-26  Ed Schonberg  <schonberg@adacore.com>

	* par-ch3.adb (P_Component_Items): When style checks are enabled,
	apply them to component declarations in a record type declaration
	or extension.

From-SVN: r229330

1 files changed, 5 insertions, 53 deletions

diff --git a/gcc/ada/contracts.adb b/gcc/ada/contracts.adb
index fa678bf..e41ae20 100644
--- a/gcc/ada/contracts.adb
+++ b/gcc/ada/contracts.adb
@@ -622,14 +622,10 @@ package body Contracts is
    --------------------------------------
 
    procedure Analyze_Subprogram_Body_Contract (Body_Id : Entity_Id) is
-      Body_Decl   : constant Node_Id   := Unit_Declaration_Node (Body_Id);
-      Items       : constant Node_Id   := Contract (Body_Id);
-      Spec_Id     : constant Entity_Id := Unique_Defining_Entity (Body_Decl);
-      Mode        : SPARK_Mode_Type;
-      Prag        : Node_Id;
-      Prag_Nam    : Name_Id;
-      Ref_Depends : Node_Id   := Empty;
-      Ref_Global  : Node_Id   := Empty;
+      Body_Decl : constant Node_Id   := Unit_Declaration_Node (Body_Id);
+      Items     : constant Node_Id   := Contract (Body_Id);
+      Spec_Id   : constant Entity_Id := Unique_Defining_Entity (Body_Decl);
+      Mode      : SPARK_Mode_Type;
 
    begin
       --  When a subprogram body declaration is illegal, its defining entity is
@@ -656,50 +652,6 @@ package body Contracts is
 
       Save_SPARK_Mode_And_Set (Body_Id, Mode);
 
-      --  All subprograms carry a contract, but for some it is not significant
-      --  and should not be processed.
-
-      if not Has_Significant_Contract (Body_Id) then
-         null;
-
-      --  The subprogram body is a completion, analyze all delayed pragmas that
-      --  apply. Note that when the body is stand-alone, the pragmas are always
-      --  analyzed on the spot.
-
-      elsif Present (Items) then
-
-         --  Locate and store pragmas Refined_Depends and Refined_Global, since
-         --  their order of analysis matters.
-
-         Prag := Classifications (Items);
-         while Present (Prag) loop
-            Prag_Nam := Pragma_Name (Prag);
-
-            if Prag_Nam = Name_Refined_Depends then
-               Ref_Depends := Prag;
-
-            elsif Prag_Nam = Name_Refined_Global then
-               Ref_Global := Prag;
-            end if;
-
-            Prag := Next_Pragma (Prag);
-         end loop;
-
-         --  Analyze Refined_Global first, as Refined_Depends may mention items
-         --  classified in the global refinement.
-
-         if Present (Ref_Global) then
-            Analyze_Refined_Global_In_Decl_Part (Ref_Global);
-         end if;
-
-         --  Refined_Depends must be analyzed after Refined_Global in order to
-         --  see the modes of all global refinements.
-
-         if Present (Ref_Depends) then
-            Analyze_Refined_Depends_In_Decl_Part (Ref_Depends);
-         end if;
-      end if;
-
       --  Ensure that the contract cases or postconditions mention 'Result or
       --  define a post-state.
 
@@ -2327,7 +2279,7 @@ package body Contracts is
 
          if Present (Prag) then
             New_Prag := New_Copy_Tree (Prag);
-            Set_Is_Inherited (New_Prag);
+            Set_Is_Inherited_Pragma (New_Prag);
 
             Add_Contract_Item (New_Prag, Subp);
          end if;