From 010e0e4fd2f97dee1f3deb1be8380c363763bd40 Mon Sep 17 00:00:00 2001 From: kazu Date: Wed, 24 Nov 2004 13:33:26 +0000 Subject: [PATCH] * tree-ssa-pre.c (phi_translate): Use find_edge to find the index of a PHI argument. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91154 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/tree-ssa-pre.c | 19 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb419356ed0..9dd15b29cbe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-24 Kazu Hirata + + * tree-ssa-pre.c (phi_translate): Use find_edge to find the + index of a PHI argument. + 2004-11-24 Steven Bosscher * expr.c (expand_expr_real_1): Remove cases for EXIT_BLOCK_EXPR diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index 38d5d2b8632..5bb552f6f81 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -922,22 +922,21 @@ phi_translate (tree expr, value_set_t set, basic_block pred, case tcc_exceptional: { tree phi = NULL; - int i; + edge e; gcc_assert (TREE_CODE (expr) == SSA_NAME); if (TREE_CODE (SSA_NAME_DEF_STMT (expr)) == PHI_NODE) phi = SSA_NAME_DEF_STMT (expr); else return expr; - for (i = 0; i < PHI_NUM_ARGS (phi); i++) - if (PHI_ARG_EDGE (phi, i)->src == pred) - { - tree val; - if (is_undefined_value (PHI_ARG_DEF (phi, i))) - return NULL; - val = vn_lookup_or_add (PHI_ARG_DEF (phi, i), NULL); - return PHI_ARG_DEF (phi, i); - } + e = find_edge (pred, bb_for_stmt (phi)); + if (e) + { + if (is_undefined_value (PHI_ARG_DEF (phi, e->dest_idx))) + return NULL; + vn_lookup_or_add (PHI_ARG_DEF (phi, e->dest_idx), NULL); + return PHI_ARG_DEF (phi, e->dest_idx); + } } return expr; -- 2.11.0