[gcc r15-9824] ada: Tweak special handling of synchronized type scopes

[Eric Botcazou]

https://gcc.gnu.org/g:67c494899585c26427dee8e9f562b87b7e502390

commit r15-9824-g67c494899585c26427dee8e9f562b87b7e502390
Author: Ronan Desplanques <desplanques@adacore.com>
Date:   Wed Apr 2 10:48:57 2025 +0200

    ada: Tweak special handling of synchronized type scopes
    
    Exp_Util.Insert_Actions handles scopes of synchronized types specially,
    but the condition it tested before this patch was not quite correct in
    some cases, for example during some expansion operations made under
    Expand_N_Task_Type_Declaration. This patch refines the test.
    
    gcc/ada/ChangeLog:
    
            * exp_util.adb (Insert_Actions): Refine test.

Diff:
---
 gcc/ada/exp_util.adb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 44e26d19a84d..5fc4ed87358d 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -8223,19 +8223,31 @@ package body Exp_Util is
                   return;
                end if;
 
-            --  the expansion of Task and protected type declarations can
+            --  The expansion of task and protected type declarations can
             --  create declarations for temporaries which, like other actions
-            --  are inserted and analyzed before the current declaraation.
-            --  However, the current scope is the synchronized type, and
-            --  for unnesting it is critical that the proper scope for these
-            --  generated entities be the enclosing one.
+            --  are inserted and analyzed before the current declaration.
+            --  However, in some cases, the current scope is the synchronized
+            --  type, and for unnesting it is critical that the proper scope
+            --  for these generated entities be the enclosing one.
 
             when N_Task_Type_Declaration
                | N_Protected_Type_Declaration =>
 
-               Push_Scope (Scope (Current_Scope));
-               Insert_List_Before_And_Analyze (P, Ins_Actions);
-               Pop_Scope;
+               declare
+                  Skip_Scope : constant Boolean :=
+                    Ekind (Current_Scope) in Concurrent_Kind;
+               begin
+                  if Skip_Scope then
+                     Push_Scope (Scope (Current_Scope));
+                  end if;
+
+                  Insert_List_Before_And_Analyze (P, Ins_Actions);
+
+                  if Skip_Scope then
+                     Pop_Scope;
+                  end if;
+               end;
+
                return;
 
             --  A special case, N_Raise_xxx_Error can act either as a statement