[gcc r14-4533] ada: Fix bad finalization of limited aggregate in conditional expression

Marc Poulhi?s dkm@gcc.gnu.org
Tue Oct 10 12:14:45 GMT 2023


https://gcc.gnu.org/g:e05e5d6bc60f938717a58a3a715c67236b0b2974

commit r14-4533-ge05e5d6bc60f938717a58a3a715c67236b0b2974
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Wed Sep 27 20:42:41 2023 +0200

    ada: Fix bad finalization of limited aggregate in conditional expression
    
    This happens when the conditional expression is immediately returned, for
    example in an expression function.
    
    gcc/ada/
    
            * exp_aggr.adb (Is_Build_In_Place_Aggregate_Return): Return true
            if the aggregate is a dependent expression of a conditional
            expression being returned from a build-in-place function.

Diff:
---
 gcc/ada/exp_aggr.adb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 165f517c031..e5f36326600 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -173,8 +173,11 @@ package body Exp_Aggr is
    ------------------------------------------------------
 
    function Is_Build_In_Place_Aggregate_Return (N : Node_Id) return Boolean;
-   --  True if N is an aggregate (possibly qualified or converted) that is
-   --  being returned from a build-in-place function.
+   --  True if N is an aggregate (possibly qualified or a dependent expression
+   --  of a conditional expression, and possibly recursively so) that is being
+   --  returned from a build-in-place function. Such qualified and conditional
+   --  expressions are transparent for this purpose because an enclosing return
+   --  is propagated resp. distributed into these expressions by the expander.
 
    function Build_Record_Aggr_Code
      (N   : Node_Id;
@@ -8463,7 +8466,11 @@ package body Exp_Aggr is
       P : Node_Id := Parent (N);
 
    begin
-      while Nkind (P) = N_Qualified_Expression loop
+      while Nkind (P) in N_Case_Expression
+                       | N_Case_Expression_Alternative
+                       | N_If_Expression
+                       | N_Qualified_Expression
+      loop
          P := Parent (P);
       end loop;


More information about the Gcc-cvs mailing list