diff mbox series

[COMMITTED] ada: Fix wrong finalization for case expression in expression function

Message ID 20230529082938.2410691-1-poulhies@adacore.com
State Committed
Commit 8eb9a6b4c4b68fb39f02608787e2bd9836544cad
Headers
Series [COMMITTED] ada: Fix wrong finalization for case expression in expression function |

Commit Message

Marc Poulhiès May 29, 2023, 8:29 a.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

This happens when the case expression contains a single alternative.

gcc/ada/

	* exp_ch5.adb (Expand_N_Case_Statement): Do not remove the statement
	if it is the node to be wrapped by a transient scope.

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

---
 gcc/ada/exp_ch5.adb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index 30af98b3fc0..2be6e7e021e 100644
--- a/gcc/ada/exp_ch5.adb
+++ b/gcc/ada/exp_ch5.adb
@@ -4127,11 +4127,15 @@  package body Exp_Ch5 is
 
          --  If there is only a single alternative, just replace it with the
          --  sequence of statements since obviously that is what is going to
-         --  be executed in all cases.
+         --  be executed in all cases, except if it is the node to be wrapped
+         --  by a transient scope, because this would cause the sequence of
+         --  statements to be leaked out of the transient scope.
 
          Len := List_Length (Alternatives (N));
 
-         if Len = 1 then
+         if Len = 1
+           and then not (Scope_Is_Transient and then Node_To_Be_Wrapped = N)
+         then
 
             --  We still need to evaluate the expression if it has any side
             --  effects.