From 64a485df891c615b9a9744589c0a36beb38604b3 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Wed, 22 Nov 2023 23:04:33 +0100 Subject: ada: Plug small loophole in finalization machinery The path in Expand_N_If_Expression implementing the special optimization for an unidimensional array type and dependent expressions with static bounds fails to call Process_Transients_In_Expression on their list of actions. gcc/ada/ * exp_ch4.adb (Expand_N_If_Expression): Also add missing calls to Process_Transients_In_Expression on the code path implementing the special optimization for an unidimensional array type and dependent expressions with static bounds. --- gcc/ada/exp_ch4.adb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gcc') diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index 8f4cf08..527ca16 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -5912,6 +5912,14 @@ package body Exp_Ch4 is and then not Generate_C_Code and then not Unnest_Subprogram_Mode then + -- When the "then" or "else" expressions involve controlled function + -- calls, generated temporaries are chained on the corresponding list + -- of actions. These temporaries need to be finalized after the if + -- expression is evaluated. + + Process_Transients_In_Expression (N, Then_Actions (N)); + Process_Transients_In_Expression (N, Else_Actions (N)); + declare Ityp : constant Entity_Id := Base_Type (Etype (First_Index (Typ))); -- cgit v1.1