ada: Fix ghost policy detection for declarations

Declarations should take the ghost policy from the region if
they do not have an explicit ghost aspect/pragam themselves.

gcc/ada/ChangeLog:

	* ghost.adb (Mark_And_Set_Ghost_Declaration): apply the
	ghost policy and level from the declaration only if the declaration
	has an explicit ghost aspect/pragma.

diff --git a/gcc/ada/ghost.adb b/gcc/ada/ghost.adb
index 695970fbdd2e5c81d66be83dcb97310e7acb1df9..b055298319e0d1873a89bf9851f608b1a4bcb557 100644 (file)
--- a/gcc/ada/ghost.adb
+++ b/gcc/ada/ghost.adb
@@ -2045,59 +2045,46 @@ package body Ghost is
       Level  : Entity_Id := Empty;
       Par_Id : Entity_Id;
       Policy : Name_Id := No_Name;
-      Id     : Entity_Id;
 
    begin
       --  A declaration becomes Ghost when it is subject to aspect or pragma
       --  Ghost.
 
-      if Is_Subject_To_Ghost (N) then
-         Id := Defining_Entity (N);
-
-         if Is_Ghost_Entity (Id) then
-            if Is_Checked_Ghost_Entity (Id) then
-               Policy := Name_Check;
-
-            elsif Is_Ignored_Ghost_Entity (Id) then
-               Policy := Name_Ignore;
-            end if;
+      Level := Get_Ghost_Assertion_Level (N);
 
-            Level := Ghost_Assertion_Level (Id);
+      --  A valid assertion level from an explicit pragma or aspect ghost
+      --  indicates the explicit ghostlyness of the declaration. Otherwise the
+      --  ghostliness of the declaration should be handled by other means like
+      --  the region.
 
-         else
-            --  We need to mark the declaration before the analysis so we
-            --  cannot rely on the Id already having the correct ghost markers.
-            --  Analyze if the node is associated with a ghost aspect here and
-            --  check for the applicable policy.
-
-            Level := Get_Ghost_Assertion_Level (N);
-            Policy :=
-              Policy_In_Effect (Name_Ghost, Assertion_Level_To_Name (Level));
-         end if;
+      if Present (Level) then
+         Policy :=
+           Policy_In_Effect (Name_Ghost, Assertion_Level_To_Name (Level));
 
       --  A declaration elaborated in a Ghost region is automatically Ghost
       --  (SPARK RM 6.9(2)).
 
       elsif Ghost_Config.Ghost_Mode = Check then
          Policy := Name_Check;
-         Level  := Ghost_Config.Ghost_Mode_Assertion_Level;
+         Level := Ghost_Config.Ghost_Mode_Assertion_Level;
 
       elsif Ghost_Config.Ghost_Mode = Ignore then
          Policy := Name_Ignore;
-         Level  := Ghost_Config.Ghost_Mode_Assertion_Level;
+         Level := Ghost_Config.Ghost_Mode_Assertion_Level;
 
       --  A child package or subprogram declaration becomes Ghost when its
       --  parent is Ghost (SPARK RM 6.9(2)).
 
-      elsif Nkind (N) in N_Generic_Function_Renaming_Declaration
-                       | N_Generic_Package_Declaration
-                       | N_Generic_Package_Renaming_Declaration
-                       | N_Generic_Procedure_Renaming_Declaration
-                       | N_Generic_Subprogram_Declaration
-                       | N_Package_Declaration
-                       | N_Package_Renaming_Declaration
-                       | N_Subprogram_Declaration
-                       | N_Subprogram_Renaming_Declaration
+      elsif Nkind (N)
+            in N_Generic_Function_Renaming_Declaration
+             | N_Generic_Package_Declaration
+             | N_Generic_Package_Renaming_Declaration
+             | N_Generic_Procedure_Renaming_Declaration
+             | N_Generic_Subprogram_Declaration
+             | N_Package_Declaration
+             | N_Package_Renaming_Declaration
+             | N_Subprogram_Declaration
+             | N_Subprogram_Renaming_Declaration
         and then Present (Parent_Spec (N))
       then
          Par_Id := Defining_Entity (Unit (Parent_Spec (N)));