From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 56248385841A; Tue, 5 Oct 2021 08:24:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 56248385841A 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-4172] [Ada] Mark private component renaming as coming from source X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: 3a0302e07c4505933b59e7c4f687d24585ecc9f1 X-Git-Newrev: b1657ff3a089785542938216e011f454be03ed89 Message-Id: <20211005082427.56248385841A@sourceware.org> Date: Tue, 5 Oct 2021 08:24:27 +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: Tue, 05 Oct 2021 08:24:27 -0000 https://gcc.gnu.org/g:b1657ff3a089785542938216e011f454be03ed89 commit r12-4172-gb1657ff3a089785542938216e011f454be03ed89 Author: Eric Botcazou Date: Thu Sep 23 12:06:42 2021 +0200 [Ada] Mark private component renaming as coming from source gcc/ada/ * exp_ch9.adb (Install_Private_Data_Declarations): Copy the Sloc of components for the local renamings as well as the Comes_From_Source flag, and also set Warnings_Off on them. Use Nam local variable. Diff: --- gcc/ada/exp_ch9.adb | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index dec41eed2f8..694cf9047ad 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -13796,14 +13796,15 @@ package body Exp_Ch9 is Comp : Node_Id; Comp_Id : Entity_Id; Decl_Id : Entity_Id; + Nam : Name_Id; begin Comp := First (Private_Declarations (Def)); while Present (Comp) loop if Nkind (Comp) = N_Component_Declaration then Comp_Id := Defining_Identifier (Comp); - Decl_Id := - Make_Defining_Identifier (Loc, Chars (Comp_Id)); + Nam := Chars (Comp_Id); + Decl_Id := Make_Defining_Identifier (Sloc (Comp_Id), Nam); -- Minimal decoration @@ -13818,6 +13819,14 @@ package body Exp_Ch9 is Set_Is_Aliased (Decl_Id, Is_Aliased (Comp_Id)); Set_Is_Independent (Decl_Id, Is_Independent (Comp_Id)); + -- Copy the Comes_From_Source flag of the component, as + -- the renaming may be the only entity directly seen by + -- the user in the context, but do not warn for it. + + Set_Comes_From_Source + (Decl_Id, Comes_From_Source (Comp_Id)); + Set_Warnings_Off (Decl_Id); + -- Generate: -- comp_name : comp_typ renames _object.comp_name; @@ -13828,10 +13837,8 @@ package body Exp_Ch9 is New_Occurrence_Of (Etype (Comp_Id), Loc), Name => Make_Selected_Component (Loc, - Prefix => - New_Occurrence_Of (Obj_Ent, Loc), - Selector_Name => - Make_Identifier (Loc, Chars (Comp_Id)))); + Prefix => New_Occurrence_Of (Obj_Ent, Loc), + Selector_Name => Make_Identifier (Loc, Nam))); Add (Decl); end if;