diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2020-06-13 11:33:04 -0400 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2020-07-27 04:05:18 -0400 |
| commit | 4a08c95cf0604a96e6fc48102365ef0d498f11ae (patch) | |
| tree | 4251c81960f577683ea9280d94b6d0ffb13948b4 /gcc/ada/inline.adb | |
| parent | 26ac7446f607b1b031bbd38fab28265fd772f8a5 (diff) | |
| download | gcc-4a08c95cf0604a96e6fc48102365ef0d498f11ae.zip gcc-4a08c95cf0604a96e6fc48102365ef0d498f11ae.tar.gz gcc-4a08c95cf0604a96e6fc48102365ef0d498f11ae.tar.bz2 | |
[Ada] Use membership tests in front-end
gcc/ada/
* aspects.adb, atree.adb, atree.ads, checks.adb, contracts.adb,
einfo.adb, errout.adb, exp_aggr.adb, exp_attr.adb, exp_cg.adb,
exp_ch11.adb, exp_ch2.adb, exp_ch3.adb, exp_ch4.adb,
exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch8.adb, exp_ch9.adb,
exp_dbug.adb, exp_disp.adb, exp_intr.adb, exp_pakd.adb,
exp_prag.adb, exp_put_image.adb, exp_smem.adb, exp_tss.adb,
exp_unst.adb, exp_util.adb, freeze.adb, ghost.adb, gnat1drv.adb,
inline.adb, lib-writ.adb, lib-xref-spark_specific.adb,
lib-xref.adb, namet.adb, namet.ads, nlists.adb, par-ch10.adb,
par-ch2.adb, par-ch3.adb, par-ch4.adb, par-ch5.adb, par-ch6.adb,
par-prag.adb, par-util.adb, par_sco.adb, pprint.adb,
repinfo.adb, restrict.adb, rtsfind.adb, scil_ll.adb, sem.adb,
sem_aggr.adb, sem_attr.adb, sem_aux.adb, sem_cat.adb,
sem_ch10.adb, sem_ch11.adb, sem_ch12.adb, sem_ch13.adb,
sem_ch3.adb, sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch7.adb,
sem_ch8.adb, sem_ch9.adb, sem_dim.adb, sem_disp.adb,
sem_dist.adb, sem_elab.adb, sem_elim.adb, sem_eval.adb,
sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
sem_scil.adb, sem_type.adb, sem_util.adb, sem_warn.adb,
sinfo.adb, sinfo.ads, sprint.adb, styleg.adb, tbuild.adb,
treepr.adb (Nkind_In, Nam_In, Ekind_In): Removed, replaced by
membership tests.
Diffstat (limited to 'gcc/ada/inline.adb')
| -rw-r--r-- | gcc/ada/inline.adb | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index b08634e..7293cf2 100644 --- a/gcc/ada/inline.adb +++ b/gcc/ada/inline.adb @@ -2793,9 +2793,9 @@ package body Inline is else Decl := Unit_Declaration_Node (Scop); - if Nkind_In (Decl, N_Subprogram_Declaration, - N_Task_Type_Declaration, - N_Subprogram_Body_Stub) + if Nkind (Decl) in N_Subprogram_Declaration + | N_Task_Type_Declaration + | N_Subprogram_Body_Stub then Decl := Unit_Declaration_Node (Corresponding_Body (Decl)); end if; @@ -2968,9 +2968,8 @@ package body Inline is and then not GNATprove_Mode) or else - (Nkind_In (A, N_Real_Literal, - N_Integer_Literal, - N_Character_Literal) + (Nkind (A) in + N_Real_Literal | N_Integer_Literal | N_Character_Literal and then not Address_Taken (F)) then if Etype (F) /= Etype (A) then @@ -3378,10 +3377,10 @@ package body Inline is -- and string literals, and attributes that yield a universal -- type, because those must be resolved to a specific type. - if Nkind_In (Expression (N), N_Aggregate, - N_Character_Literal, - N_Null, - N_String_Literal) + if Nkind (Expression (N)) in N_Aggregate + | N_Character_Literal + | N_Null + | N_String_Literal or else Yields_Universal_Type (Expression (N)) then Ret := @@ -4234,7 +4233,7 @@ package body Inline is then Conv := Current_Entity (Id); - elsif Nkind_In (Id, N_Selected_Component, N_Expanded_Name) + elsif Nkind (Id) in N_Selected_Component | N_Expanded_Name and then Chars (Selector_Name (Id)) = Name_Unchecked_Conversion then Conv := Current_Entity (Selector_Name (Id)); @@ -4366,13 +4365,13 @@ package body Inline is S := First (Stats); while Present (S) loop - if Nkind_In (S, N_Abort_Statement, - N_Asynchronous_Select, - N_Conditional_Entry_Call, - N_Delay_Relative_Statement, - N_Delay_Until_Statement, - N_Selective_Accept, - N_Timed_Entry_Call) + if Nkind (S) in N_Abort_Statement + | N_Asynchronous_Select + | N_Conditional_Entry_Call + | N_Delay_Relative_Statement + | N_Delay_Until_Statement + | N_Selective_Accept + | N_Timed_Entry_Call then Cannot_Inline ("cannot inline & (non-allowed statement)?", S, Subp); @@ -5112,18 +5111,18 @@ package body Inline is end if; if Present (Item_Id) - and then Nam_In (Chars (Item_Id), Name_Contract_Cases, - Name_Global, - Name_Depends, - Name_Postcondition, - Name_Precondition, - Name_Refined_Global, - Name_Refined_Depends, - Name_Refined_Post, - Name_Test_Case, - Name_Unmodified, - Name_Unreferenced, - Name_Unused) + and then Chars (Item_Id) in Name_Contract_Cases + | Name_Global + | Name_Depends + | Name_Postcondition + | Name_Precondition + | Name_Refined_Global + | Name_Refined_Depends + | Name_Refined_Post + | Name_Test_Case + | Name_Unmodified + | Name_Unreferenced + | Name_Unused then Remove (Item); end if; |