From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id CA6393858017; Fri, 20 Oct 2023 03:49:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA6393858017 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697773742; bh=uZUvNg6mUx9UFwdSyHCGaGNRwfOP2ZEfNLnyCWgPguk=; h=From:To:Subject:Date:From; b=J6UZ+9KrvLWPOPB/3jMNP18VcZbjKy+QJ6MCfOXkeECD0ZNBDrV3zjvyOdpQyqaxc 6w3fXHKTbul7abGZWXMOqMhYUuhZqxhIw9QBfuFbw3sRE9RUF8fDcwtBcC2wRAUs9g 8KIFddRpjArcWgD8q9j9p7I0Ad1r3mi7vFpzzSlE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] rename make_eh_edges to make_eh_edge X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: c3b026b0995a27c92751e4c5be857cf7adfb9135 X-Git-Newrev: cfb0a55cb94536ea319b02914a967b5357f58b62 Message-Id: <20231020034902.CA6393858017@sourceware.org> Date: Fri, 20 Oct 2023 03:49:02 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cfb0a55cb94536ea319b02914a967b5357f58b62 commit cfb0a55cb94536ea319b02914a967b5357f58b62 Author: Alexandre Oliva 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; }