From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id D75B93858006; Wed, 1 Dec 2021 10:26:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D75B93858006 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5674] [Ada] Fix issues with ignored ghost code and unnesting X-Act-Checkin: gcc X-Git-Author: Richard Kenner X-Git-Refname: refs/heads/master X-Git-Oldrev: dbdb6b93a2808d5c3d518e9675d058fab3b8f89b X-Git-Newrev: be6bb3fc57e2af376e5c18eeca51119e87a55ee3 Message-Id: <20211201102650.D75B93858006@sourceware.org> Date: Wed, 1 Dec 2021 10:26:50 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2021 10:26:50 -0000 https://gcc.gnu.org/g:be6bb3fc57e2af376e5c18eeca51119e87a55ee3 commit r12-5674-gbe6bb3fc57e2af376e5c18eeca51119e87a55ee3 Author: Richard Kenner Date: Tue Nov 16 09:39:57 2021 -0500 [Ada] Fix issues with ignored ghost code and unnesting gcc/ada/ * frontend.adb (Frontend): Do unnesting after ignored ghost code has been removed. * inline.adb (Analyze_Inlined_Bodies): Don't put ignored ghost entities on inlined subprogram list. Diff: --- gcc/ada/frontend.adb | 15 ++++++++------- gcc/ada/inline.adb | 11 ++++++++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gcc/ada/frontend.adb b/gcc/ada/frontend.adb index a65b3e1b410..b78fc9cf30d 100644 --- a/gcc/ada/frontend.adb +++ b/gcc/ada/frontend.adb @@ -473,12 +473,6 @@ begin Check_Elaboration_Scenarios; end if; - -- At this stage we can unnest subprogram bodies if required - - if Total_Errors_Detected = 0 then - Exp_Unst.Unnest_Subprograms (Cunit (Main_Unit)); - end if; - -- List library units if requested if List_Units then @@ -494,12 +488,19 @@ begin Sem_Warn.Output_Unused_Warnings_Off_Warnings; -- Remove any ignored Ghost code as it must not appear in the - -- executable. This action must be performed last because it + -- executable. This action must be performed very late because it -- heavily alters the tree. if Operating_Mode = Generate_Code or else GNATprove_Mode then Remove_Ignored_Ghost_Code; end if; + + -- At this stage we can unnest subprogram bodies if required + + if Total_Errors_Detected = 0 then + Exp_Unst.Unnest_Subprograms (Cunit (Main_Unit)); + end if; + end if; end if; end; diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index 08c454d366e..11a5523f4b7 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -1087,9 +1087,14 @@ package body Inline is -- subprograms for the unit. for Index in Inlined.First .. Inlined.Last loop - if Is_Called (Inlined.Table (Index).Name) then - Add_Inlined_Subprogram (Inlined.Table (Index).Name); - end if; + declare + E : constant Subprogram_Kind_Id := Inlined.Table (Index).Name; + + begin + if Is_Called (E) and then not Is_Ignored_Ghost_Entity (E) then + Add_Inlined_Subprogram (E); + end if; + end; end loop; Pop_Scope;