From: Piotr Trojanek <troja...@adacore.com>
Cleanup code and documentation; semantics is unaffected.
gcc/ada/
* doc/gnat_rm/implementation_defined_pragmas.rst
(Lock_Free): Remove inconsistent periods that end item
descriptions.
* sem_ch9.adb
(Allows_Lock_Free_Implementation): Remove unnecessary guard
against an empty list of parameters; replace low-level entity kind
membership test with a high-level query; refill error message.
* gnat_rm.texi: Regenerate.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst | 6 +++---
gcc/ada/gnat_rm.texi | 6 +++---
gcc/ada/sem_ch9.adb | 8 +++-----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
b/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
index 53836c9fbcf..6752d48d159 100644
--- a/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
+++ b/gcc/ada/doc/gnat_rm/implementation_defined_pragmas.rst
@@ -3744,10 +3744,10 @@ In addition, each protected subprogram body must
satisfy:
* May reference only one protected component
* May not reference nonconstant entities outside the protected subprogram
- scope.
+ scope
* May not contain address representation items, allocators, or quantified
- expressions.
-* May not contain delay, goto, loop, or procedure-call statements.
+ expressions
+* May not contain delay, goto, loop, or procedure-call statements
* May not contain exported and imported entities
* May not dereferenced access values
* Function calls and attribute references must be static
diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index e13dba037ff..e79cdeeacfe 100644
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -5243,14 +5243,14 @@ May reference only one protected component
@item
May not reference nonconstant entities outside the protected subprogram
-scope.
+scope
@item
May not contain address representation items, allocators, or quantified
-expressions.
+expressions
@item
-May not contain delay, goto, loop, or procedure-call statements.
+May not contain delay, goto, loop, or procedure-call statements
@item
May not contain exported and imported entities
diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index cae0f233c52..6506358a02b 100644
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -178,8 +178,6 @@ package body Sem_Ch9 is
elsif Nkind (Decl) = N_Subprogram_Declaration
and then
Nkind (Specification (Decl)) = N_Procedure_Specification
- and then
- Present (Parameter_Specifications (Specification (Decl)))
then
declare
Par_Specs : constant List_Id :=
@@ -477,7 +475,7 @@ package body Sem_Ch9 is
-- Prohibit references to non-constant entities
-- outside the protected subprogram scope.
- if Ekind (Id) in Assignable_Kind
+ if Is_Assignable (Id)
and then not
Scope_Within_Or_Same (Scope (Id), Sub_Id)
and then not
@@ -487,8 +485,8 @@ package body Sem_Ch9 is
then
if Lock_Free_Given then
Error_Msg_NE
- ("reference to global variable& not " &
- "allowed", N, Id);
+ ("reference to global variable& not allowed",
+ N, Id);
return Skip;
end if;
--
2.34.1
