https://gcc.gnu.org/g:73898ceb25052518b7e5427df3f05fe7e2784f55
commit r13-8455-g73898ceb25052518b7e5427df3f05fe7e2784f55
Author: Jakub Jelinek <ja...@redhat.com>
Date: Thu Mar 14 09:57:13 2024 +0100
gimple-iterator: Some gsi_safe_insert_*before fixes
When trying to use the gsi_safe_insert*before APIs in bitint lowering,
I've discovered 3 issues and the following patch addresses those:
1) both split_block and split_edge update CDI_DOMINATORS if they are
available, but because edge_before_returns_twice_call first splits
and then adds an extra EDGE_ABNORMAL edge and then removes another
one, the immediate dominators of both the new bb and the bb with
returns_twice call need to change
2) the new EDGE_ABNORMAL edge had uninitialized probability; this patch
copies the probability from the edge that is going to be removed
and similarly copies other flags (EDGE_EXECUTABLE, EDGE_DFS_BACK,
EDGE_IRREDUCIBLE_LOOP etc.)
3) if edge_before_returns_twice_call splits a block, then the bb with
returns_twice call changes, so the gimple_stmt_iterator for it is
no longer accurate, it points to the right statement, but gsi_bb
and gsi_seq are no longer correct; the patch updates it
2024-03-14 Jakub Jelinek <ja...@redhat.com>
* gimple-iterator.cc (edge_before_returns_twice_call): Copy all
flags and probability from ad_edge to e edge. If CDI_DOMINATORS
are computed, recompute immediate dominator of other_edge->src
and other_edge->dest.
(gsi_safe_insert_before, gsi_safe_insert_seq_before): Update *iter
for the returns_twice call case to the gsi_for_stmt (stmt) to deal
with update it for bb splitting.
(cherry picked from commit 8f6e0814b4bfd0a399055e9214562aebfcd902ad)
Diff:
---
gcc/gimple-iterator.cc | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/gcc/gimple-iterator.cc b/gcc/gimple-iterator.cc
index c18ea22c486..07a77ca2a77 100644
--- a/gcc/gimple-iterator.cc
+++ b/gcc/gimple-iterator.cc
@@ -996,7 +996,18 @@ edge_before_returns_twice_call (basic_block bb)
add_phi_arg (new_phi, PHI_ARG_DEF_FROM_EDGE (phi, ad_edge),
e, gimple_phi_arg_location_from_edge (phi, ad_edge));
}
+ e->flags = ad_edge->flags;
+ e->probability = ad_edge->probability;
remove_edge (ad_edge);
+ if (dom_info_available_p (CDI_DOMINATORS))
+ {
+ set_immediate_dominator (CDI_DOMINATORS, other_edge->src,
+ recompute_dominator (CDI_DOMINATORS,
+ other_edge->src));
+ set_immediate_dominator (CDI_DOMINATORS, other_edge->dest,
+ recompute_dominator (CDI_DOMINATORS,
+ other_edge->dest));
+ }
}
return other_edge;
}
@@ -1044,6 +1055,7 @@ gsi_safe_insert_before (gimple_stmt_iterator *iter,
gimple *g)
if (new_bb)
e = single_succ_edge (new_bb);
adjust_before_returns_twice_call (e, g);
+ *iter = gsi_for_stmt (stmt);
}
else
gsi_insert_before (iter, g, GSI_SAME_STMT);
@@ -1074,6 +1086,7 @@ gsi_safe_insert_seq_before (gimple_stmt_iterator *iter,
gimple_seq seq)
if (g == l)
break;
}
+ *iter = gsi_for_stmt (stmt);
}
else
gsi_insert_seq_before (iter, seq, GSI_SAME_STMT);
