From bb1c939d9b800ef9aadf8a82cbafdfae5c88210c Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Fri, 4 Feb 2022 20:56:51 +0100 Subject: [PATCH] [Ada] Fix scope of block in expanded protected entry body We expand protected entry body into procedure with a nested block. The scope of this block is naturally the enclosing procedure. However, the scope field was wrongly set to the entity of the enclosing procedure body (i.e. E_Subprogram_Body); now it is set to the entity of the enclosing procedure spec (i.e. E_Procedure). In general, the scope field should always points to spec, even for entities that are syntactically nested within a program unit body. The scope set to E_Subprogram_Body entity was only accepted because in gigi we had a protection for that, but this protection is now removed. This patch fixes a regression in a ravenscar testsuite test (c_rf02_06), where GNAT was crashing when compiling in configurable runtime mode with restriction No_Exception_Propagation. gcc/ada/ * exp_ch9.adb (Build_Protected_Entry): Set scope of the nested block to spec and not the body of the procedure created for a protected entry. --- gcc/ada/exp_ch9.adb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb index 04a87fb4f9a..f7067805979 100644 --- a/gcc/ada/exp_ch9.adb +++ b/gcc/ada/exp_ch9.adb @@ -3707,7 +3707,8 @@ package body Exp_Ch9 is Analyze_Statements (Bod_Stmts); - Set_Scope (Entity (Identifier (First (Bod_Stmts))), Bod_Id); + Set_Scope (Entity (Identifier (First (Bod_Stmts))), + Protected_Body_Subprogram (Ent)); Reset_Scopes_To (First (Bod_Stmts), Entity (Identifier (First (Bod_Stmts)))); -- 2.47.2