diff mbox series

[COMMITTED] ada: Plug small loophole in finalization machinery

Message ID 20231219143034.454911-1-poulhies@adacore.com
State Accepted
Headers
Series [COMMITTED] ada: Plug small loophole in finalization machinery |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Marc Poulhiès Dec. 19, 2023, 2:30 p.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/exp_ch4.adb | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 8f4cf0808dc..527ca16aac4 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)));