From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id CB34E386189B; Tue, 26 Sep 2023 11:46:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB34E386189B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1695728761; bh=ailMUSD9pAQBTy0XZR9ArS1ZV+Ouq0wGwk4bxk8nlZk=; h=From:To:Subject:Date:From; b=YbcRhl7nKyxgsCtn/QLwSOoGENpJQFu4zLOCIR0RCTSR5gVy07/doXbIymWNoC0VP /52c6+gmm5E9g+vmrWsieRQ05TFdeREZP/8ofD12XJ2XDLDVG0YJcK5Q9DJwbepfM9 u/RSYUsCFVSZvI6iDecofG4RdJJigm0vp+pLon9w= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4272] ada: Fix missing finalization of extended return object on abnormal completion X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: 198e643b35df4743e3177fc3a77b50325ae44717 X-Git-Newrev: 2e135bdb28d386b0cda2ee7e35338ad06136042d Message-Id: <20230926114601.CB34E386189B@sourceware.org> Date: Tue, 26 Sep 2023 11:46:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:2e135bdb28d386b0cda2ee7e35338ad06136042d commit r14-4272-g2e135bdb28d386b0cda2ee7e35338ad06136042d Author: Eric Botcazou Date: Thu Sep 14 16:42:45 2023 +0200 ada: Fix missing finalization of extended return object on abnormal completion This happens in the case of a nonlimited return type and is a fallout of the optimization recently implemented for them. gcc/ada/ * einfo.ads (Status_Flag_Or_Transient_Decl): Remove ??? comment. * exp_ch6.adb (Expand_N_Extended_Return_Statement): Extend the handling of finalizable return objects to the non-BIP case. * exp_ch7.adb (Build_Finalizer.Process_Declarations): Adjust the comment accordingly. * exp_util.adb (Requires_Cleanup_Actions): Likewise. Diff: --- gcc/ada/einfo.ads | 8 ++++---- gcc/ada/exp_ch6.adb | 4 ++-- gcc/ada/exp_ch7.adb | 6 +++--- gcc/ada/exp_util.adb | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index 977392899f9..9165fb7485d 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -4518,11 +4518,11 @@ package Einfo is -- Status_Flag_Or_Transient_Decl -- Defined in constant, loop, and variable entities. Applies to objects -- that require special treatment by the finalization machinery, such as --- extended return results, IF and CASE expression results, and objects +-- extended return objects, conditional expression results, and objects -- inside N_Expression_With_Actions nodes. The attribute contains the --- entity of a flag which specifies particular behavior over a region of --- code or the declaration of a "hook" object. --- In which case is it a flag, or a hook object??? +-- entity of a flag which specifies a particular behavior over a region +-- of the extended return for the return objects, or the declaration of a +-- hook object for conditional expressions and N_Expression_With_Actions. -- Storage_Size_Variable [implementation base type only] -- Defined in access types and task type entities. This flag is set diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index a16dfe2d57e..beb2e2f90f0 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -5607,7 +5607,7 @@ package body Exp_Ch6 is -- with the scope finalizer. There is one flag per each return object -- in case of multiple returns. - if Is_BIP_Func and then Needs_Finalization (Etype (Ret_Obj_Id)) then + if Needs_Finalization (Etype (Ret_Obj_Id)) then declare Flag_Decl : Node_Id; Flag_Id : Entity_Id; @@ -5706,7 +5706,7 @@ package body Exp_Ch6 is -- Update the state of the function right before the object is -- returned. - if Is_BIP_Func and then Needs_Finalization (Etype (Ret_Obj_Id)) then + if Needs_Finalization (Etype (Ret_Obj_Id)) then declare Flag_Id : constant Entity_Id := Status_Flag_Or_Transient_Decl (Ret_Obj_Id); diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb index 4ea5e6ede64..271dfd22618 100644 --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -2381,9 +2381,9 @@ package body Exp_Ch7 is elsif Is_Ignored_Ghost_Entity (Obj_Id) then null; - -- Return object of a build-in-place function. This case is - -- recognized and marked by the expansion of an extended return - -- statement (see Expand_N_Extended_Return_Statement). + -- Return object of extended return statements. This case is + -- recognized and marked by the expansion of extended return + -- statements (see Expand_N_Extended_Return_Statement). elsif Needs_Finalization (Obj_Typ) and then Is_Return_Object (Obj_Id) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 2e6a1cf892e..9ac64fe9381 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -13127,9 +13127,9 @@ package body Exp_Util is elsif Is_Ignored_Ghost_Entity (Obj_Id) then null; - -- Return object of a build-in-place function. This case is - -- recognized and marked by the expansion of an extended return - -- statement (see Expand_N_Extended_Return_Statement). + -- Return object of extended return statements. This case is + -- recognized and marked by the expansion of extended return + -- statements (see Expand_N_Extended_Return_Statement). elsif Needs_Finalization (Obj_Typ) and then Is_Return_Object (Obj_Id)