@@ -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
@@ -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
@@ -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.
@@ -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;
@@ -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;
@@ -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