From: Eric Botcazou <ebotca...@adacore.com>
The temporary is first finalized through its enclosing block.
gcc/ada/
* exp_ch4.adb (Expand_N_Expression_With_Actions.Process_Action): Do
not look into nested blocks.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/exp_ch4.adb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 95b81fb8e53..b63e47335be 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -5653,14 +5653,17 @@ package body Exp_Ch4 is
return Skip;
-- Avoid processing temporary function results multiple times when
- -- dealing with nested expression_with_actions.
+ -- dealing with nested expression_with_actions or nested blocks.
-- 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) in N_Expression_With_Actions | N_Loop_Statement then
+ elsif Nkind (Act) in N_Expression_With_Actions
+ | N_Block_Statement
+ | N_Loop_Statement
+ then
return Skip;
end if;
--
2.40.0
