From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 89AAB3857413; Wed, 18 May 2022 08:44:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 89AAB3857413 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 r13-602] [Ada] Use specific predicate before manipulating BIP_Alloc_Form X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: ddb82555b422eb175471a3f4df40b27f872ce9bf X-Git-Newrev: ef07419f73ac5cc436282a607591e289bb480626 Message-Id: <20220518084423.89AAB3857413@sourceware.org> Date: Wed, 18 May 2022 08:44:23 +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, 18 May 2022 08:44:23 -0000 https://gcc.gnu.org/g:ef07419f73ac5cc436282a607591e289bb480626 commit r13-602-gef07419f73ac5cc436282a607591e289bb480626 Author: Eric Botcazou Date: Mon Mar 28 21:16:24 2022 +0200 [Ada] Use specific predicate before manipulating BIP_Alloc_Form For the sake of consistency with other similar manipulations. gcc/ada/ * exp_ch7.adb (Build_BIP_Cleanup_Stmts): Use Needs_BIP_Alloc_Form. Diff: --- gcc/ada/exp_ch7.adb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 74343646515..0c53f326887 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -2850,16 +2850,14 @@ package body Exp_Ch7 is Left_Opnd => New_Occurrence_Of (Fin_Mas_Id, Loc), Right_Opnd => Make_Null (Loc)); - -- For constrained or tagged results escalate the condition to + -- For unconstrained or tagged results, escalate the condition to -- include the allocation format. Generate: -- if BIPallocform > Secondary_Stack'Pos -- and then BIPfinalizationmaster /= null -- then - if not Is_Constrained (Func_Typ) - or else Is_Tagged_Type (Func_Typ) - then + if Needs_BIP_Alloc_Form (Func_Id) then declare Alloc : constant Entity_Id := Build_In_Place_Formal (Func_Id, BIP_Alloc_Form);