public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/aoliva/heads/testme)] rename make_eh_edges to make_eh_edge
@ 2023-10-20 3:49 Alexandre Oliva
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Oliva @ 2023-10-20 3:49 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:cfb0a55cb94536ea319b02914a967b5357f58b62
commit cfb0a55cb94536ea319b02914a967b5357f58b62
Author: Alexandre Oliva <oliva@gnu.org>
Date: Fri Oct 20 00:45:02 2023 -0300
rename make_eh_edges to make_eh_edge
Diff:
---
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 a299b984375c..1999e827a04c 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 5c28fd07f332..7b69281bffc0 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 612ece9f1855..e944fe1d1101 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 f748ca850894..d41b80d93b6e 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 1cb8e0865290..6a30ed9d2b8a 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 1382568b7c91..045424fe6ece 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 d63060c9429c..867f3b22b589 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;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] rename make_eh_edges to make_eh_edge
@ 2023-10-21 3:36 Alexandre Oliva
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Oliva @ 2023-10-21 3:36 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:abbba098e8d5137249c492ddd5cb1ac7186a4464
commit abbba098e8d5137249c492ddd5cb1ac7186a4464
Author: Alexandre Oliva <oliva@adacore.com>
Date: Fri Oct 20 00:45:02 2023 -0300
rename make_eh_edges to make_eh_edge
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.
Diff:
---
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 a299b984375c..1999e827a04c 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 5c28fd07f332..7b69281bffc0 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 612ece9f1855..e944fe1d1101 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 f748ca850894..d41b80d93b6e 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 1cb8e0865290..6a30ed9d2b8a 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 1382568b7c91..045424fe6ece 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 d63060c9429c..867f3b22b589 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;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gcc(refs/users/aoliva/heads/testme)] rename make_eh_edges to make_eh_edge
@ 2023-10-20 5:56 Alexandre Oliva
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Oliva @ 2023-10-20 5:56 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:f2b8c6526769d12fcf677dc6f9a3db7b28cdc94e
commit f2b8c6526769d12fcf677dc6f9a3db7b28cdc94e
Author: Alexandre Oliva <oliva@gnu.org>
Date: Fri Oct 20 00:45:02 2023 -0300
rename make_eh_edges to make_eh_edge
Diff:
---
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 a299b984375c..1999e827a04c 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 5c28fd07f332..7b69281bffc0 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 612ece9f1855..e944fe1d1101 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 f748ca850894..d41b80d93b6e 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 1cb8e0865290..6a30ed9d2b8a 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 1382568b7c91..045424fe6ece 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 d63060c9429c..867f3b22b589 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;
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-21 3:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-20 3:49 [gcc(refs/users/aoliva/heads/testme)] rename make_eh_edges to make_eh_edge Alexandre Oliva
2023-10-20 5:56 Alexandre Oliva
2023-10-21 3:36 Alexandre Oliva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).