[Ada] Replace low-level detection of subprograms with high-level wrapper

gcc/ada/

	* exp_aggr.adb, sem_cat.adb, sem_ch10.adb, sem_ch12.adb,
	sem_elim.adb, sem_util.adb: Replace uses of Subprogram_Kind with
	Is_Subprogram.
This commit is contained in:
Piotr Trojanek 2021-11-10 12:41:19 +01:00 committed by Pierre-Marie de Rodat
parent a41a910745
commit 0f3dfe41cb
6 changed files with 6 additions and 6 deletions

View file

@ -9248,7 +9248,7 @@ package body Exp_Aggr is
when N_Object_Declaration =>
return not Constant_Present (C)
and then Ekind (Current_Scope) in Subprogram_Kind;
and then Is_Subprogram (Current_Scope);
-- False for all other contexts

View file

@ -807,7 +807,7 @@ package body Sem_Cat is
end if;
if not Is_Remote_Call_Interface (E) then
if Ekind (E) in Subprogram_Kind then
if Is_Subprogram (E) then
Declaration := Unit_Declaration_Node (E);
if Nkind (Declaration) in

View file

@ -5271,7 +5271,7 @@ package body Sem_Ch10 is
end if;
if Is_Generic_Instance (Uname)
and then Ekind (Uname) in Subprogram_Kind
and then Is_Subprogram (Uname)
then
-- Set flag as well on the visible entity that denotes the
-- instance, which renames the current one.

View file

@ -5298,7 +5298,7 @@ package body Sem_Ch12 is
Scop := Scope (E);
while Scop /= Standard_Standard loop
if Ekind (Scop) in Subprogram_Kind and then Is_Inlined (Scop) then
if Is_Subprogram (Scop) and then Is_Inlined (Scop) then
return True;
end if;

View file

@ -247,7 +247,7 @@ package body Sem_Elim is
-- Elimination of objects and types is not implemented yet
elsif Ekind (E) not in Subprogram_Kind then
elsif not Is_Subprogram (E) then
return;
end if;

View file

@ -29476,7 +29476,7 @@ package body Sem_Util is
-- Since we are only interested in the formal case, avoid
-- the anonymous access result type.
if Ekind (Def_Ent) in Subprogram_Kind
if Is_Subprogram (Def_Ent)
and then not (Ekind (Def_Ent) = E_Function
and then Etype (Def_Ent) = Typ)
then