From df95526be1b070f6dab3167f362056f4c2c43cfd Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 8 Nov 2004 21:21:49 -0700 Subject: [PATCH] cfg.c (redirect_edge_succ_nodup): Use find_edge rather than implementing it inline. * cfg.c (redirect_edge_succ_nodup): Use find_edge rather than implementing it inline. * cfganal.c (find_edge): Search pred->succs or succ->preds, whichever is shorter. From-SVN: r90333 --- gcc/ChangeLog | 8 ++++++++ gcc/cfg.c | 9 ++------- gcc/cfganal.c | 15 ++++++++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 20f50a6c80e..6af64c641ab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2004-11-08 Jeff Law + + * cfg.c (redirect_edge_succ_nodup): Use find_edge rather than + implementing it inline. + + * cfganal.c (find_edge): Search pred->succs or succ->preds, + whichever is shorter. + 2004-11-08 Kazu Hirata * passes.c (rest_of_handle_jump): Remove dead code. diff --git a/gcc/cfg.c b/gcc/cfg.c index 1901a59051c..b3da1429b1d 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -428,14 +428,9 @@ edge redirect_edge_succ_nodup (edge e, basic_block new_succ) { edge s; - edge_iterator ei; - - /* Check whether the edge is already present. */ - FOR_EACH_EDGE (s, ei, e->src->succs) - if (s->dest == new_succ && s != e) - break; - if (s) + s = find_edge (e->src, new_succ); + if (s && s != e) { s->flags |= e->flags; s->probability += e->probability; diff --git a/gcc/cfganal.c b/gcc/cfganal.c index 651f1534552..06c71f678c6 100644 --- a/gcc/cfganal.c +++ b/gcc/cfganal.c @@ -478,9 +478,18 @@ find_edge (basic_block pred, basic_block succ) edge e; edge_iterator ei; - FOR_EACH_EDGE (e, ei, pred->succs) - if (e->dest == succ) - return e; + if (EDGE_COUNT (pred->succs) <= EDGE_COUNT (succ->preds)) + { + FOR_EACH_EDGE (e, ei, pred->succs) + if (e->dest == succ) + return e; + } + else + { + FOR_EACH_EDGE (e, ei, succ->preds) + if (e->src == pred) + return e; + } return NULL; } -- 2.30.2