[Ada] Reuse Is_Generic_Subprogram where possible

gcc/ada/

	* lib-writ.adb, sem_ch8.adb, sem_prag.adb: Use
	Is_Generic_Subprogram instead of low-level membership tests.
This commit is contained in:
Piotr Trojanek 2020-10-28 09:27:18 +01:00 committed by Pierre-Marie de Rodat
parent ebf90d68e9
commit aa83f3d0b7
3 changed files with 5 additions and 11 deletions

View File

@ -1125,9 +1125,7 @@ package body Lib.Writ is
if Nkind (U) = N_Subprogram_Body
and then Present (Corresponding_Spec (U))
and then
Ekind (Corresponding_Spec (U)) in E_Generic_Procedure
| E_Generic_Function
and then Is_Generic_Subprogram (Corresponding_Spec (U))
then
null;

View File

@ -8750,9 +8750,8 @@ package body Sem_Ch8 is
-- Mark primitives
elsif (Ekind (Id) in Overloadable_Kind
or else Ekind (Id) in
E_Generic_Function | E_Generic_Procedure)
elsif (Is_Overloadable (Id)
or else Is_Generic_Subprogram (Id))
and then (Is_Potentially_Use_Visible (Id)
or else Is_Intrinsic_Subprogram (Id)
or else (Ekind (Id) in E_Function | E_Procedure

View File

@ -24781,18 +24781,15 @@ package body Sem_Prag is
-- body, not in the spec).
when Pragma_Unimplemented_Unit => Unimplemented_Unit : declare
Cunitent : constant Entity_Id :=
Cunitent : constant Entity_Id :=
Cunit_Entity (Get_Source_Unit (Loc));
Ent_Kind : constant Entity_Kind := Ekind (Cunitent);
begin
GNAT_Pragma;
Check_Arg_Count (0);
if Operating_Mode = Generate_Code
or else Ent_Kind = E_Generic_Function
or else Ent_Kind = E_Generic_Procedure
or else Ent_Kind = E_Generic_Package
or else Is_Generic_Unit (Cunitent)
then
Get_Name_String (Chars (Cunitent));
Set_Casing (Mixed_Case);