From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id C174F3857C51; Wed, 24 Nov 2021 20:38:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C174F3857C51 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5506] Reduce scope of a few 'class loop *loop' variables X-Act-Checkin: gcc X-Git-Author: Thomas Schwinge X-Git-Refname: refs/heads/master X-Git-Oldrev: 5deacf6058d1bc7261a75c9fd1f116c4442e9e60 X-Git-Newrev: 9e026da720091704ca0456d405f16a3bc5f3a799 Message-Id: <20211124203828.C174F3857C51@sourceware.org> Date: Wed, 24 Nov 2021 20:38:28 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2021 20:38:28 -0000 https://gcc.gnu.org/g:9e026da720091704ca0456d405f16a3bc5f3a799 commit r12-5506-g9e026da720091704ca0456d405f16a3bc5f3a799 Author: Thomas Schwinge Date: Fri Jul 30 09:23:20 2021 +0200 Reduce scope of a few 'class loop *loop' variables Further clean-up after commit e41ba804ba5f5ca433e09238d561b1b4c8b10985 "Use range-based for loops for traversing loops". No functional change. gcc/ * cfgloop.c (verify_loop_structure): Reduce scope of 'class loop *loop' variable. * ipa-fnsummary.c (analyze_function_body): Likewise. * loop-init.c (fix_loop_structure): Likewise. * loop-invariant.c (calculate_loop_reg_pressure): Likewise. * predict.c (predict_loops): Likewise. * tree-loop-distribution.c (loop_distribution::execute): Likewise. * tree-vectorizer.c (pass_vectorize::execute): Likewise. Diff: --- gcc/cfgloop.c | 3 +-- gcc/ipa-fnsummary.c | 3 +-- gcc/loop-init.c | 2 +- gcc/loop-invariant.c | 4 ++-- gcc/predict.c | 3 +-- gcc/tree-loop-distribution.c | 2 +- gcc/tree-vectorizer.c | 5 ++--- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c index 20c24c13c36..3190d12b2ce 100644 --- a/gcc/cfgloop.c +++ b/gcc/cfgloop.c @@ -1398,7 +1398,6 @@ verify_loop_structure (void) { unsigned *sizes, i, j; basic_block bb, *bbs; - class loop *loop; int err = 0; edge e; unsigned num = number_of_loops (cfun); @@ -1689,7 +1688,7 @@ verify_loop_structure (void) for (; exit; exit = exit->next_e) eloops++; - for (loop = bb->loop_father; + for (class loop *loop = bb->loop_father; loop != e->dest->loop_father /* When a loop exit is also an entry edge which can happen when avoiding CFG manipulations diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c index 7e9201a554a..cb13d2e4b3c 100644 --- a/gcc/ipa-fnsummary.c +++ b/gcc/ipa-fnsummary.c @@ -2934,7 +2934,6 @@ analyze_function_body (struct cgraph_node *node, bool early) if (nonconstant_names.exists () && !early) { ipa_fn_summary *s = ipa_fn_summaries->get (node); - class loop *loop; unsigned max_loop_predicates = opt_for_fn (node->decl, param_ipa_max_loop_predicates); @@ -2978,7 +2977,7 @@ analyze_function_body (struct cgraph_node *node, bool early) /* To avoid quadratic behavior we analyze stride predicates only with respect to the containing loop. Thus we simply iterate over all defs in the outermost loop body. */ - for (loop = loops_for_fn (cfun)->tree_root->inner; + for (class loop *loop = loops_for_fn (cfun)->tree_root->inner; loop != NULL; loop = loop->next) { ipa_predicate loop_stride = true; diff --git a/gcc/loop-init.c b/gcc/loop-init.c index 04054ef6222..f0931a99661 100644 --- a/gcc/loop-init.c +++ b/gcc/loop-init.c @@ -201,7 +201,6 @@ fix_loop_structure (bitmap changed_bbs) { basic_block bb; int record_exits = 0; - class loop *loop; unsigned old_nloops, i; timevar_push (TV_LOOP_INIT); @@ -279,6 +278,7 @@ fix_loop_structure (bitmap changed_bbs) /* Finally free deleted loops. */ bool any_deleted = false; + class loop *loop; FOR_EACH_VEC_ELT (*get_loops (cfun), i, loop) if (loop && loop->header == NULL) { diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c index fca0c2b24be..5eee2e5c9f8 100644 --- a/gcc/loop-invariant.c +++ b/gcc/loop-invariant.c @@ -2134,7 +2134,7 @@ calculate_loop_reg_pressure (void) basic_block bb; rtx_insn *insn; rtx link; - class loop *loop, *parent; + class loop *parent; for (auto loop : loops_list (cfun, 0)) if (loop->aux == NULL) @@ -2151,7 +2151,7 @@ calculate_loop_reg_pressure (void) if (curr_loop == current_loops->tree_root) continue; - for (loop = curr_loop; + for (class loop *loop = curr_loop; loop != current_loops->tree_root; loop = loop_outer (loop)) bitmap_ior_into (&LOOP_DATA (loop)->regs_live, DF_LR_IN (bb)); diff --git a/gcc/predict.c b/gcc/predict.c index 68b11135680..3cb4e3c0eb5 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -1927,7 +1927,6 @@ predict_extra_loop_exits (edge exit_edge) static void predict_loops (void) { - class loop *loop; basic_block bb; hash_set with_recursion(10); @@ -1941,7 +1940,7 @@ predict_loops (void) && (decl = gimple_call_fndecl (gsi_stmt (gsi))) != NULL && recursive_call_p (current_function_decl, decl)) { - loop = bb->loop_father; + class loop *loop = bb->loop_father; while (loop && !with_recursion.add (loop)) loop = loop_outer (loop); } diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index 583c01a42d8..c9e18739165 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -3737,7 +3737,6 @@ prepare_perfect_loop_nest (class loop *loop) unsigned int loop_distribution::execute (function *fun) { - class loop *loop; bool changed = false; basic_block bb; control_dependences *cd = NULL; @@ -3845,6 +3844,7 @@ loop_distribution::execute (function *fun) /* Destroy loop bodies that could not be reused. Do this late as we otherwise can end up refering to stale data in control dependences. */ unsigned i; + class loop *loop; FOR_EACH_VEC_ELT (loops_to_be_destroyed, i, loop) destroy_loop (loop); diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index 0e1cee99bae..f4a2873a91e 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -1209,7 +1209,6 @@ pass_vectorize::execute (function *fun) unsigned int i; unsigned int num_vectorized_loops = 0; unsigned int vect_loops_num; - class loop *loop; hash_table *simduid_to_vf_htab = NULL; hash_table *simd_array_to_simduid_htab = NULL; bool any_ifcvt_loops = false; @@ -1293,7 +1292,7 @@ pass_vectorize::execute (function *fun) if (any_ifcvt_loops) for (i = 1; i < number_of_loops (fun); i++) { - loop = get_loop (fun, i); + class loop *loop = get_loop (fun, i); if (loop && loop->dont_vectorize) { gimple *g = vect_loop_vectorized_call (loop); @@ -1342,7 +1341,7 @@ pass_vectorize::execute (function *fun) loop_vec_info loop_vinfo; bool has_mask_store; - loop = get_loop (fun, i); + class loop *loop = get_loop (fun, i); if (!loop || !loop->aux) continue; loop_vinfo = (loop_vec_info) loop->aux;