From: Andrew Pinski Date: Mon, 10 Nov 2025 01:22:14 +0000 (-0800) Subject: cfgcleanup: Move ei definition into for loop for remove_forwarder_block X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ae0090b71d392e60f58f1b42b65c5b7d4aff9e5;p=thirdparty%2Fgcc.git cfgcleanup: Move ei definition into for loop for remove_forwarder_block This moves the ei definition directly into for loo like was done for remove_forwarder_block_with_phi. gcc/ChangeLog: * tree-cfgcleanup.cc (remove_forwarder_block): Move variable declaration ei into for loop. Signed-off-by: Andrew Pinski --- diff --git a/gcc/tree-cfgcleanup.cc b/gcc/tree-cfgcleanup.cc index 14ebeb35e64..bac68f1533d 100644 --- a/gcc/tree-cfgcleanup.cc +++ b/gcc/tree-cfgcleanup.cc @@ -624,7 +624,6 @@ remove_forwarder_block (basic_block bb) edge succ = single_succ_edge (bb), e, s; basic_block dest = succ->dest; gimple *stmt; - edge_iterator ei; gimple_stmt_iterator gsi, gsi_to; /* If there is an abnormal edge to basic block BB, but not into @@ -648,6 +647,7 @@ remove_forwarder_block (basic_block bb) phi node arguments match. */ if (!gimple_seq_empty_p (phi_nodes (dest))) { + edge_iterator ei; FOR_EACH_EDGE (e, ei, bb->preds) { s = find_edge (e->src, dest); @@ -665,7 +665,7 @@ remove_forwarder_block (basic_block bb) bool dest_single_pred_p = single_pred_p (dest); /* Redirect the edges. */ - for (ei = ei_start (bb->preds); (e = ei_safe_edge (ei)); ) + for (edge_iterator ei = ei_start (bb->preds); (e = ei_safe_edge (ei)); ) { bitmap_set_bit (cfgcleanup_altered_bbs, e->src->index);