From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 28 Mar 2022 19:16:24 +0000 (+0200)
Subject: [Ada] Use specific predicate before manipulating BIP_Alloc_Form
X-Git-Tag: basepoints/gcc-14~6605
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef07419f73ac5cc436282a607591e289bb480626;p=thirdparty%2Fgcc.git

[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 --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);