[Ada] Allow attributes Version and Body_Version prefixed by entries

Message ID 20210503092945.GA77563@adacore.com
State New
Headers show
  • [Ada] Allow attributes Version and Body_Version prefixed by entries
Related show

Commit Message

Pierre-Marie de Rodat May 3, 2021, 9:29 a.m.
Prefix of attributes Version and Body_Version denotes any program unit,
including protected entries, which were wrongly rejected this context.

Tested on x86_64-pc-linux-gnu, committed on trunk


	* sem_attr.adb (Check_Program_Unit): Replace tests for Task_Kind
	and Protected_Kind with a collective test for Concurrent_Kind;
	likewise, replace calls to Is_Task_Type and Is_Protected_Type
	with a collective call to Is_Concurrent_Type; simplify into a
	single membership test; add missing Entry_Kind alternative.


diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -2302,16 +2302,12 @@  package body Sem_Attr is
                T : constant Entity_Id   := Etype (Entity (P));
-               if K in Subprogram_Kind
-                 or else K in Task_Kind
-                 or else K in Protected_Kind
-                 or else K = E_Package
-                 or else K in Generic_Unit_Kind
-                 or else (K = E_Variable
-                            and then
-                              (Is_Task_Type (T)
-                                 or else
-                               Is_Protected_Type (T)))
+               if K in Concurrent_Kind
+                     | Entry_Kind
+                     | Generic_Unit_Kind
+                     | Subprogram_Kind
+                     | E_Package
+                 or else (K = E_Variable and then Is_Concurrent_Type (T))
                end if;