From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id CC9013858002; Wed, 1 Dec 2021 10:25:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CC9013858002 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-5656] [Ada] Simplify building of inequality function body X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: f05f68bc00755e39ed05a17e5f74483f151a7fee X-Git-Newrev: 659e775a17415341113dcbd4b23f52d6cd63f502 Message-Id: <20211201102518.CC9013858002@sourceware.org> Date: Wed, 1 Dec 2021 10:25:18 +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:25:18 -0000 https://gcc.gnu.org/g:659e775a17415341113dcbd4b23f52d6cd63f502 commit r12-5656-g659e775a17415341113dcbd4b23f52d6cd63f502 Author: Piotr Trojanek Date: Fri Nov 5 15:13:47 2021 +0100 [Ada] Simplify building of inequality function body gcc/ada/ * exp_ch3.adb (Make_Eq_Body): Refactor to avoid appending to an empty list; also, when exiting early we will not create any list; fix style in comment. Diff: --- gcc/ada/exp_ch3.adb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index c91008f69a8..6c3fb01fdf3 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -10138,7 +10138,6 @@ package body Exp_Ch3 is -- Local variables Loc : constant Source_Ptr := Sloc (Parent (Tag_Typ)); - Stmts : constant List_Id := New_List; Decl : Node_Id; Eq_Prim : Entity_Id; Left_Op : Entity_Id; @@ -10154,7 +10153,7 @@ package body Exp_Ch3 is -- the body executed is that of the overriding declaration, even if the -- overriding declaration is not visible at the place of the renaming; -- otherwise, the inherited or predefined subprogram is called, see - -- (RM 8.5.4(8)) + -- (RM 8.5.4(8)). -- Stage 1: Search for a renaming of the inequality primitive and also -- search for an overriding of the equality primitive located before the @@ -10264,18 +10263,18 @@ package body Exp_Ch3 is end; end if; - Append_To (Stmts, - Make_Simple_Return_Statement (Loc, - Expression => - Make_Op_Not (Loc, - Make_Function_Call (Loc, - Name => New_Occurrence_Of (Target, Loc), - Parameter_Associations => New_List ( - Make_Identifier (Loc, Chars (Left_Op)), - Make_Identifier (Loc, Chars (Right_Op))))))); - Set_Handled_Statement_Sequence - (Decl, Make_Handled_Sequence_Of_Statements (Loc, Stmts)); + (Decl, + Make_Handled_Sequence_Of_Statements (Loc, New_List ( + Make_Simple_Return_Statement (Loc, + Expression => + Make_Op_Not (Loc, + Make_Function_Call (Loc, + Name => New_Occurrence_Of (Target, Loc), + Parameter_Associations => New_List ( + Make_Identifier (Loc, Chars (Left_Op)), + Make_Identifier (Loc, Chars (Right_Op))))))))); + return Decl; end Make_Neq_Body;