diff options
| author | Alexandre Oliva <oliva@adacore.com> | 2023-10-20 00:35:17 -0300 |
|---|---|---|
| committer | Alexandre Oliva <oliva@gnu.org> | 2023-10-20 00:35:17 -0300 |
| commit | df252e0f254638c44034f1879db34286c88a92c2 (patch) | |
| tree | 0d1165a3815946e5a0156bb0cf8b23b4c6aa7626 | |
| parent | 1d260ab0e39ea63644e3af3ab2e0db946026b5a6 (diff) | |
| download | gcc-df252e0f254638c44034f1879db34286c88a92c2.zip gcc-df252e0f254638c44034f1879db34286c88a92c2.tar.gz gcc-df252e0f254638c44034f1879db34286c88a92c2.tar.bz2 | |
return edge in make_eh_edges
The need to initialize edge probabilities has made make_eh_edges
undesirably hard to use. I suppose we don't want make_eh_edges to
initialize the probability of the newly-added edge itself, so that the
caller takes care of it, but identifying the added edge in need of
adjustments is inefficient and cumbersome. Change make_eh_edges so
that it returns the added edge.
for gcc/ChangeLog
* tree-eh.cc (make_eh_edges): Return the new edge.
* tree-eh.h (make_eh_edges): Likewise.
| -rw-r--r-- | gcc/tree-eh.cc | 6 | ||||
| -rw-r--r-- | gcc/tree-eh.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/tree-eh.cc b/gcc/tree-eh.cc index e8ceff3..1cb8e08 100644 --- a/gcc/tree-eh.cc +++ b/gcc/tree-eh.cc @@ -2274,7 +2274,7 @@ make_eh_dispatch_edges (geh_dispatch *stmt) /* Create the single EH edge from STMT to its nearest landing pad, if there is such a landing pad within the current function. */ -void +edge make_eh_edges (gimple *stmt) { basic_block src, dst; @@ -2283,14 +2283,14 @@ make_eh_edges (gimple *stmt) lp_nr = lookup_stmt_eh_lp (stmt); if (lp_nr <= 0) - return; + return NULL; lp = get_eh_landing_pad_from_number (lp_nr); gcc_assert (lp != NULL); src = gimple_bb (stmt); dst = label_to_block (cfun, lp->post_landing_pad); - make_edge (src, dst, EDGE_EH); + return make_edge (src, dst, EDGE_EH); } /* Do the work in redirecting EDGE_IN to NEW_BB within the EH region tree; diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h index 771be50..1382568 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 void make_eh_edges (gimple *); +extern edge make_eh_edges (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, |