diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-01 15:21:23 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-09-01 15:21:23 +0200 |
| commit | d1c5f4243e66f7d2c70dcebf88a4d91f2e019bcc (patch) | |
| tree | f4b74c551490e0f742dfde5aa5c529016fd19b35 /gcc/ada/prj-proc.adb | |
| parent | 1bb6e262cf96060be3098d2089c1fe059e73dedd (diff) | |
| download | gcc-d1c5f4243e66f7d2c70dcebf88a4d91f2e019bcc.zip gcc-d1c5f4243e66f7d2c70dcebf88a4d91f2e019bcc.tar.gz gcc-d1c5f4243e66f7d2c70dcebf88a4d91f2e019bcc.tar.bz2 | |
[multiple changes]
2011-09-01 Robert Dewar <dewar@adacore.com>
* prj-proc.adb, exp_ch6.adb, prj-env.adb: Minor reformatting.
2011-09-01 Bob Duff <duff@adacore.com>
* sem_aggr.adb (Resolve_Aggregate): Need to treat "in instance
body" the same as "in inlined body", because visibility shouldn't
apply there.
2011-09-01 Eric Botcazou <ebotcazou@adacore.com>
* inline.adb (Add_Inlined_Body): Refine previous change.
From-SVN: r178412
Diffstat (limited to 'gcc/ada/prj-proc.adb')
| -rw-r--r-- | gcc/ada/prj-proc.adb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index 251b86d..b5869b2 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -2765,6 +2765,7 @@ package body Prj.Proc is Project := Processed_Projects.Get (Name); if Project /= No_Project then + -- Make sure that, when a project is extended, the project id -- of the project extending it is recorded in its data, even -- when it has already been processed as an imported project. @@ -2777,13 +2778,16 @@ package body Prj.Proc is return; end if; - Project := new Project_Data' - (Empty_Project - (Project_Qualifier_Of + Project := + new Project_Data' + (Empty_Project + (Project_Qualifier_Of (From_Project_Node, From_Project_Node_Tree))); - In_Tree.Projects := new Project_List_Element' - (Project => Project, - Next => In_Tree.Projects); + + In_Tree.Projects := + new Project_List_Element' + (Project => Project, + Next => In_Tree.Projects); Processed_Projects.Set (Name, Project); @@ -2833,10 +2837,12 @@ package body Prj.Proc is and then In_Tree.Is_Root_Tree then Initialize_And_Copy (Child_Env, Copy_From => Env); + else -- No need to initialize Child_Env, since it will not be -- used anyway by Process_Declarative_Items (only the root -- aggregate can modify it, and it is never read anyway). + null; end if; |