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...
	* gimple-harden-conditionals.cc: ... here, ...
	* gimple-harden-control-flow.cc: ... here, ...
	* tree-cfg.cc: ... here, ...
	* tree-inline.cc: ... and here.

diff --git a/gcc/gimple-harden-conditionals.cc b/gcc/gimple-harden-conditionals.cc
index a299b984375cd7dd3907845bbbadc539b0347cc0..1999e827a04ca3772d6df71756dddb3018f73a75 100644 (file)
--- 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 441df5ac21c65f4c9d9c0ecc0aa5c6b07177a4cc..3711b25d09123a7f2192fa36f9bd03c7fd0967e3 100644 (file)
--- a/gcc/gimple-harden-control-flow.cc
+++ b/gcc/gimple-harden-control-flow.cc
@@ -1287,7 +1287,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/tree-cfg.cc b/gcc/tree-cfg.cc
index ffeb20b717aead756844c5f48c2cc23f5e9f14a6..40a6f2a3b529f44b07f0e76ac89e31d95b29517e 100644 (file)
--- 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 1cb8e08652909b17595326c154ef43b213b91a62..6a30ed9d2b8a60ccd07695014f77a4322c9543e0 100644 (file)
--- 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 1382568b7c9195e59e3c4ebd34dc391444d8b85e..045424fe6ece3c242e792332de76c61befc6acb7 100644 (file)
--- 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 69387b525f9e042b808050f28ff00ec65d3c2ff1..00d05102e7adc3b356d707700ffdb258561a55dc 100644 (file)
--- 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;
        }