diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2019-10-31 13:38:17 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-06-02 04:58:10 -0400 |
| commit | ea55d344b17b19b866cdc189268547d677959cb1 (patch) | |
| tree | 998ae7a931f6a7ad7d7ba4a73462c2e3a1270bb0 /gcc | |
| parent | c2f285434dc5dff1a396cc3616959c7a2b80a750 (diff) | |
| download | gcc-ea55d344b17b19b866cdc189268547d677959cb1.zip gcc-ea55d344b17b19b866cdc189268547d677959cb1.tar.gz gcc-ea55d344b17b19b866cdc189268547d677959cb1.tar.bz2 | |
[Ada] Accept objects from nested packages in Initializes contract
2020-06-02 Piotr Trojanek <trojanek@adacore.com>
gcc/ada/
* sem_prag.adb (Collect_States_And_Objects): Call itself on
declaration of nested packages; append abstract states
one-by-one, so that in recursive call we do not overwrite the
ones that have been already collected.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/sem_prag.adb | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 7aa48b5..9dff1ce 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -2897,7 +2897,7 @@ package body Sem_Prag is -- Verify the legality of a single initialization item followed by a -- list of input items. - procedure Collect_States_And_Objects; + procedure Collect_States_And_Objects (Pack_Decl : Node_Id); -- Inspect the visible declarations of the related package and gather -- the entities of all abstract states and objects in States_And_Objs. @@ -3166,15 +3166,21 @@ package body Sem_Prag is -- Collect_States_And_Objects -- -------------------------------- - procedure Collect_States_And_Objects is - Pack_Spec : constant Node_Id := Specification (Pack_Decl); - Decl : Node_Id; + procedure Collect_States_And_Objects (Pack_Decl : Node_Id) is + Pack_Spec : constant Node_Id := Specification (Pack_Decl); + Pack_Id : constant Entity_Id := Defining_Entity (Pack_Decl); + Decl : Node_Id; + State_Elmt : Elmt_Id; begin -- Collect the abstract states defined in the package (if any) - if Present (Abstract_States (Pack_Id)) then - States_And_Objs := New_Copy_Elist (Abstract_States (Pack_Id)); + if Has_Non_Null_Abstract_State (Pack_Id) then + State_Elmt := First_Elmt (Abstract_States (Pack_Id)); + while Present (State_Elmt) loop + Append_New_Elmt (Node (State_Elmt), States_And_Objs); + Next_Elmt (State_Elmt); + end loop; end if; -- Collect all objects that appear in the visible declarations of the @@ -3189,6 +3195,9 @@ package body Sem_Prag is then Append_New_Elmt (Defining_Entity (Decl), States_And_Objs); + elsif Nkind (Decl) = N_Package_Declaration then + Collect_States_And_Objects (Decl); + elsif Is_Single_Concurrent_Type_Declaration (Decl) then Append_New_Elmt (Anonymous_Object (Defining_Entity (Decl)), @@ -3228,7 +3237,7 @@ package body Sem_Prag is -- Initialize the various lists used during analysis - Collect_States_And_Objects; + Collect_States_And_Objects (Pack_Decl); if Present (Expressions (Inits)) then Init := First (Expressions (Inits)); |