From: Eric Botcazou Date: Sun, 27 Aug 2023 07:34:59 +0000 (+0200) Subject: ada: Fix late finalization for function call in delta aggregate X-Git-Tag: basepoints/gcc-15~6154 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8f05af400c99cdbdccfc57d536ccf5e1f0bdc47;p=thirdparty%2Fgcc.git ada: Fix late finalization for function call in delta aggregate The problem occurs at library level because the temporary created for the function call lives in the elaboration routine but is finalized only when the package itself is. It turns out that there is no need for this temporary, since the expansion of delta aggregates already creates a (properly finalized) temporary. gcc/ada/ * exp_ch6.adb (Expand_Ctrl_Function_Call): Also do nothing for the expression of a delta aggregate. --- diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 0d1f1fb1c3b2..da1c9e661022 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -5424,9 +5424,13 @@ package body Exp_Ch6 is -- object, then no need to copy/readjust/finalize, we can initialize it -- in place. However, if the call returns on the secondary stack, then -- we need the expansion because we'll be renaming the temporary as the - -- (permanent) object. + -- (permanent) object. We also apply it in the case of the expression of + -- a delta aggregate, since it is used only to initialize a temporary. - if Nkind (Par) = N_Object_Declaration and then not Use_Sec_Stack then + if Nkind (Par) in N_Object_Declaration | N_Delta_Aggregate + and then Expression (Par) = N + and then not Use_Sec_Stack + then return; end if;