From: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu, 6 Apr 2023 22:26:19 +0000 (+0200)
Subject: ada: Fix wrong finalization for case expression in expression function
X-Git-Tag: basepoints/gcc-15~8797
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eb9a6b4c4b68fb39f02608787e2bd9836544cad;p=thirdparty%2Fgcc.git

ada: Fix wrong finalization for case expression in expression function

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.
---

diff --git a/gcc/ada/exp_ch5.adb b/gcc/ada/exp_ch5.adb
index 30af98b3fc03..2be6e7e021e5 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.