From da5c25f37101cd71f08e31ad581a00840ef75497 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 27 Jan 2021 10:10:04 +0100 Subject: [PATCH] Rename PROP_trees to PROP_gimple PROP_trees actually means GIMPLE IL, rather than GENERIC, so better not to confuse users. 2021-01-27 Jakub Jelinek * tree-pass.h (PROP_trees): Rename to ... (PROP_gimple): ... this. * cfgexpand.c (pass_data_expand): Replace PROP_trees with PROP_gimple. * passes.c (execute_function_dump, execute_function_todo, execute_one_ipa_transform_pass, execute_one_pass): Likewise. * varpool.c (ctor_for_folding): Likewise. --- gcc/cfgexpand.c | 2 +- gcc/passes.c | 10 +++++----- gcc/tree-pass.h | 2 +- gcc/varpool.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index b73019b241f..8d20ca6cefb 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -6503,7 +6503,7 @@ const pass_data pass_data_expand = | PROP_gimple_lvec | PROP_gimple_lva), /* properties_required */ PROP_rtl, /* properties_provided */ - ( PROP_ssa | PROP_trees ), /* properties_destroyed */ + ( PROP_ssa | PROP_gimple ), /* properties_destroyed */ 0, /* todo_flags_start */ 0, /* todo_flags_finish */ }; diff --git a/gcc/passes.c b/gcc/passes.c index 4fb1be99ce4..64550b00b43 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -1793,7 +1793,7 @@ execute_function_dump (function *fn, void *data) { push_cfun (fn); - if (fn->curr_properties & PROP_trees) + if (fn->curr_properties & PROP_gimple) dump_function_to_file (fn->decl, dump_file, dump_flags); else print_rtl_with_bb (dump_file, get_insns (), dump_flags); @@ -2034,7 +2034,7 @@ execute_function_todo (function *fn, void *data) if (flags & TODO_verify_il) { - if (cfun->curr_properties & PROP_trees) + if (cfun->curr_properties & PROP_gimple) { if (cfun->curr_properties & PROP_cfg) /* IPA passes leave stmts to be fixed up, so make sure to @@ -2272,7 +2272,7 @@ execute_one_ipa_transform_pass (struct cgraph_node *node, /* Note that the folders should only create gimple expressions. This is a hack until the new folder is ready. */ - in_gimple_form = (cfun && (cfun->curr_properties & PROP_trees)) != 0; + in_gimple_form = (cfun && (cfun->curr_properties & PROP_gimple)) != 0; pass_init_dump_file (pass); @@ -2545,7 +2545,7 @@ execute_one_pass (opt_pass *pass) /* Note that the folders should only create gimple expressions. This is a hack until the new folder is ready. */ - in_gimple_form = (cfun && (cfun->curr_properties & PROP_trees)) != 0; + in_gimple_form = (cfun && (cfun->curr_properties & PROP_gimple)) != 0; pass_init_dump_file (pass); @@ -2628,7 +2628,7 @@ execute_one_pass (opt_pass *pass) pass_fini_dump_file (pass); if (pass->type != SIMPLE_IPA_PASS && pass->type != IPA_PASS) - gcc_assert (!(cfun->curr_properties & PROP_trees) + gcc_assert (!(cfun->curr_properties & PROP_gimple) || pass->type != RTL_PASS); current_pass = NULL; diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 7e905ea49ed..15693fee150 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -225,7 +225,7 @@ protected: #define PROP_gimple_lomp_dev (1 << 16) /* done omp_device_lower */ #define PROP_rtl_split_insns (1 << 17) /* RTL has insns split. */ -#define PROP_trees \ +#define PROP_gimple \ (PROP_gimple_any | PROP_gimple_lcf | PROP_gimple_leh | PROP_gimple_lomp) /* To-do flags. */ diff --git a/gcc/varpool.c b/gcc/varpool.c index 86f16052984..4830df5c320 100644 --- a/gcc/varpool.c +++ b/gcc/varpool.c @@ -415,7 +415,7 @@ ctor_for_folding (tree decl) gcc_assert (!TREE_PUBLIC (decl)); /* Unless this is called during FE folding. */ if (cfun - && (cfun->curr_properties & (PROP_trees | PROP_rtl)) == 0 + && (cfun->curr_properties & (PROP_gimple | PROP_rtl)) == 0 && TREE_READONLY (decl) && !TREE_SIDE_EFFECTS (decl) && DECL_INITIAL (decl)) -- 2.30.2