[Ada] Simplify membership tests with N_Subprogram_Call subtype

gcc/ada/

	* exp_ch6.adb, exp_util.adb, sem_ch4.adb, sem_disp.adb,
	sem_elab.adb: Simplify membership test.
This commit is contained in:
Piotr Trojanek 2020-11-29 22:20:09 +01:00 committed by Pierre-Marie de Rodat
parent 1053ff8a3a
commit 612c48b13b
5 changed files with 6 additions and 9 deletions

View File

@ -3491,8 +3491,7 @@ package body Exp_Ch6 is
-- of the dimension I/O packages.
if Ada_Version >= Ada_2012
and then
Nkind (Call_Node) in N_Procedure_Call_Statement | N_Function_Call
and then Nkind (Call_Node) in N_Subprogram_Call
and then Present (Parameter_Associations (Call_Node))
then
Expand_Put_Call_With_Symbol (Call_Node);

View File

@ -12247,8 +12247,7 @@ package body Exp_Util is
-- and view swaps, the parent type is taken from the formal
-- parameter of the subprogram being called.
if Nkind (Context) in
N_Function_Call | N_Procedure_Call_Statement
if Nkind (Context) in N_Subprogram_Call
and then No (Type_Map.Get (Entity (Name (Context))))
then
New_Ref :=

View File

@ -8088,8 +8088,7 @@ package body Sem_Ch4 is
-- resolution does not depend on the type of the parameter that
-- includes the indexing operation.
elsif Nkind (Parent (Par)) in
N_Function_Call | N_Procedure_Call_Statement
elsif Nkind (Parent (Par)) in N_Subprogram_Call
and then Is_Entity_Name (Name (Parent (Par)))
then
declare

View File

@ -625,7 +625,7 @@ package body Sem_Disp is
Par := Parent (Par);
end if;
if Nkind (Par) in N_Function_Call | N_Procedure_Call_Statement
if Nkind (Par) in N_Subprogram_Call
and then Is_Entity_Name (Name (Par))
then
declare

View File

@ -3744,7 +3744,7 @@ package body Sem_Elab is
Set_Is_Dispatching_Call
(Marker,
Nkind (N) in N_Function_Call | N_Procedure_Call_Statement
Nkind (N) in N_Subprogram_Call
and then Present (Controlling_Argument (N)));
Set_Is_Elaboration_Checks_OK_Node
@ -19368,7 +19368,7 @@ package body Sem_Elab is
function Is_Call_Of_Generic_Formal (N : Node_Id) return Boolean is
begin
return Nkind (N) in N_Function_Call | N_Procedure_Call_Statement
return Nkind (N) in N_Subprogram_Call
-- Always return False if debug flag -gnatd.G is set