On Oct 19, 2023, Richard Biener <richard.guent...@gmail.com> wrote:
> Maybe time to do s/make_eh_edges/make_eh_edge/ though.
How about this? Regstrapped on x86_64-linux-gnu and ppc64le-linux-gnu,
on top of the patches for strub, hardbool, and hardcfr that I've just
posted. Ok to install?
----
Since make_eh_edges creates at most one edge, rename it to
make_eh_edge.
for gcc/ChangeLog
* tree-eh.h (make_eh_edges): Rename to...
(make_eh_edge): ... this.
* tree-eh.cc: Likewise. Adjust all callers.
---
gcc/gimple-harden-conditionals.cc | 2 +-
gcc/gimple-harden-control-flow.cc | 2 +-
gcc/ipa-strub.cc | 2 +-
gcc/tree-cfg.cc | 6 +++---
gcc/tree-eh.cc | 4 ++--
gcc/tree-eh.h | 2 +-
gcc/tree-inline.cc | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gcc/gimple-harden-conditionals.cc
b/gcc/gimple-harden-conditionals.cc
index a299b984375cd..1999e827a04ca 100644
--- a/gcc/gimple-harden-conditionals.cc
+++ b/gcc/gimple-harden-conditionals.cc
@@ -580,7 +580,7 @@ pass_harden_compares::execute (function *fun)
if (throwing_compare_p)
{
add_stmt_to_eh_lp (asgnck, lookup_stmt_eh_lp (asgn));
- make_eh_edges (asgnck);
+ make_eh_edge (asgnck);
edge ckeh;
basic_block nbb = split_edge (non_eh_succ_edge
diff --git a/gcc/gimple-harden-control-flow.cc
b/gcc/gimple-harden-control-flow.cc
index 5c28fd07f3329..7b69281bffc0b 100644
--- a/gcc/gimple-harden-control-flow.cc
+++ b/gcc/gimple-harden-control-flow.cc
@@ -1285,7 +1285,7 @@ pass_harden_control_flow_redundancy::execute (function
*fun)
add_stmt_to_eh_lp (stmt, lp_eh_cleanup);
/* Finally, wire the EH cleanup block into the CFG. */
- edge neeh = make_eh_edges (stmt);
+ edge neeh = make_eh_edge (stmt);
neeh->probability = profile_probability::never ();
gcc_checking_assert (neeh->dest == bb_eh_cleanup);
if (neeh->dest->count.initialized_p ())
diff --git a/gcc/ipa-strub.cc b/gcc/ipa-strub.cc
index 612ece9f18552..e944fe1d1101d 100644
--- a/gcc/ipa-strub.cc
+++ b/gcc/ipa-strub.cc
@@ -2075,7 +2075,7 @@ gsi_insert_finally_seq_after_call (gimple_stmt_iterator
gsi, gimple_seq seq)
gsi_insert_before (&gsi, resx, GSI_SAME_STMT);
/* Finally, wire the EH cleanup block into the CFG. */
- edge neeh = make_eh_edges (stmt);
+ edge neeh = make_eh_edge (stmt);
neeh->probability = profile_probability::never ();
gcc_checking_assert (neeh->dest == bb_eh_cleanup);
gcc_checking_assert (!neeh->dest->count.initialized_p ());
diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index f748ca8508940..d41b80d93b6e7 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -878,7 +878,7 @@ make_edges_bb (basic_block bb, struct omp_region
**pcur_region, int *pomp_index)
fallthru = false;
break;
case GIMPLE_RESX:
- make_eh_edges (last);
+ make_eh_edge (last);
fallthru = false;
break;
case GIMPLE_EH_DISPATCH:
@@ -894,7 +894,7 @@ make_edges_bb (basic_block bb, struct omp_region
**pcur_region, int *pomp_index)
/* If this statement has reachable exception handlers, then
create abnormal edges to them. */
- make_eh_edges (last);
+ make_eh_edge (last);
/* BUILTIN_RETURN is really a return statement. */
if (gimple_call_builtin_p (last, BUILT_IN_RETURN))
@@ -911,7 +911,7 @@ make_edges_bb (basic_block bb, struct omp_region
**pcur_region, int *pomp_index)
/* A GIMPLE_ASSIGN may throw internally and thus be considered
control-altering. */
if (is_ctrl_altering_stmt (last))
- make_eh_edges (last);
+ make_eh_edge (last);
fallthru = true;
break;
diff --git a/gcc/tree-eh.cc b/gcc/tree-eh.cc
index 1cb8e08652909..6a30ed9d2b8a6 100644
--- a/gcc/tree-eh.cc
+++ b/gcc/tree-eh.cc
@@ -2275,7 +2275,7 @@ make_eh_dispatch_edges (geh_dispatch *stmt)
if there is such a landing pad within the current function. */
edge
-make_eh_edges (gimple *stmt)
+make_eh_edge (gimple *stmt)
{
basic_block src, dst;
eh_landing_pad lp;
@@ -4921,7 +4921,7 @@ make_pass_cleanup_eh (gcc::context *ctxt)
#endif
/* Verify that BB containing STMT as the last statement, has precisely the
- edge that make_eh_edges would create. */
+ edge that make_eh_edge would create. */
DEBUG_FUNCTION bool
verify_eh_edges (gimple *stmt)
diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h
index 1382568b7c919..045424fe6ece3 100644
--- a/gcc/tree-eh.h
+++ b/gcc/tree-eh.h
@@ -30,7 +30,7 @@ extern bool remove_stmt_from_eh_lp (gimple *);
extern int lookup_stmt_eh_lp_fn (struct function *, const gimple *);
extern int lookup_stmt_eh_lp (const gimple *);
extern bool make_eh_dispatch_edges (geh_dispatch *);
-extern edge make_eh_edges (gimple *);
+extern edge make_eh_edge (gimple *);
extern edge redirect_eh_edge (edge, basic_block);
extern void redirect_eh_dispatch_edge (geh_dispatch *, edge, basic_block);
extern bool operation_could_trap_helper_p (enum tree_code, bool, bool, bool,
diff --git a/gcc/tree-inline.cc b/gcc/tree-inline.cc
index d63060c9429c4..867f3b22b589a 100644
--- a/gcc/tree-inline.cc
+++ b/gcc/tree-inline.cc
@@ -2615,7 +2615,7 @@ copy_edges_for_bb (basic_block bb, profile_count num,
profile_count den,
}
else if (can_throw)
{
- make_eh_edges (copy_stmt);
+ make_eh_edge (copy_stmt);
update_probs = true;
}
--
Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/
Free Software Activist GNU Toolchain Engineer
More tolerance and less prejudice are key for inclusion and diversity
Excluding neuro-others for not behaving ""normal"" is *not* inclusive
