[gcc r12-1593] [Ada] Missing finalization on nested expression with action

[gcc r12-1593] [Ada] Missing finalization on nested expression with action

[Pierre-Marie de Rodat]

https://gcc.gnu.org/g:5f900b589c83b789329a0e99ddbe627507703e5e

commit r12-1593-g5f900b589c83b789329a0e99ddbe627507703e5e
Author: Arnaud Charlet <charlet@adacore.com>
Date:   Thu Mar 11 11:00:04 2021 -0500

    [Ada] Missing finalization on nested expression with action
    
    gcc/ada/
    
            * exp_ch4.adb (Expand_N_Expression_With_Actions.Process_Action):
            Do not abandon processing on a nested N_Expression_With_Actions
            or N_Loop_Statement, otherwise we may miss some transient
            declarations.

Diff:
---
 gcc/ada/exp_ch4.adb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 5b3a11677db..4436557b354 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -5780,15 +5780,14 @@ package body Exp_Ch4 is
 
          --  Avoid processing temporary function results multiple times when
          --  dealing with nested expression_with_actions.
+         --  Similarly, do not process temporary function results in loops.
+         --  This is done by Expand_N_Loop_Statement and Build_Finalizer.
+         --  Note that we used to wrongly return Abandon instead of Skip here:
+         --  this is wrong since it means that we were ignoring lots of
+         --  relevant subsequent statements.
 
-         elsif Nkind (Act) = N_Expression_With_Actions then
-            return Abandon;
-
-         --  Do not process temporary function results in loops. This is done
-         --  by Expand_N_Loop_Statement and Build_Finalizer.
-
-         elsif Nkind (Act) = N_Loop_Statement then
-            return Abandon;
+         elsif Nkind (Act) in N_Expression_With_Actions | N_Loop_Statement then
+            return Skip;
          end if;
 
          return OK;