aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2022-02-04 20:56:51 +0100
committerPierre-Marie de Rodat <derodat@adacore.com>2022-05-12 12:38:35 +0000
commitbb1c939d9b800ef9aadf8a82cbafdfae5c88210c (patch)
treeabb5e53e3d3edd9b03d5807b6ed88d04c39d9cb5
parent7a60ba4c831a6d5e0d58cdfa64ddcb7c6ac09835 (diff)
downloadgcc-bb1c939d9b800ef9aadf8a82cbafdfae5c88210c.zip
gcc-bb1c939d9b800ef9aadf8a82cbafdfae5c88210c.tar.gz
gcc-bb1c939d9b800ef9aadf8a82cbafdfae5c88210c.tar.bz2
[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.
-rw-r--r--gcc/ada/exp_ch9.adb3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 04a87fb..f706780 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))));