From cbe92cbb287112fd0ff64f5569f7164c799f3e3d Mon Sep 17 00:00:00 2001 From: kazu Date: Sat, 5 Mar 2005 13:49:43 +0000 Subject: [PATCH] * predict.c (apply_return_prediction): Standardize PHI chain walking. * tree-ssa.c (ssa_redirect_edge): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95930 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/predict.c | 11 +++-------- gcc/tree-ssa.c | 6 ++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bd96cf9a02c3..6077f1a9bfb1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-03-05 Kazu Hirata + + * predict.c (apply_return_prediction): Standardize PHI chain + walking. + * tree-ssa.c (ssa_redirect_edge): Likewise. + 2005-03-05 Richard Sandiford * doc/invoke.texi: Document new MIPS -msym32 and -mno-sym32 options. diff --git a/gcc/predict.c b/gcc/predict.c index bf594acfc92a..9a00f0bb15fe 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -1207,14 +1207,9 @@ apply_return_prediction (int *heads) || !SSA_NAME_DEF_STMT (return_val) || TREE_CODE (SSA_NAME_DEF_STMT (return_val)) != PHI_NODE) return; - phi = SSA_NAME_DEF_STMT (return_val); - while (phi) - { - tree next = PHI_CHAIN (phi); - if (PHI_RESULT (phi) == return_val) - break; - phi = next; - } + for (phi = SSA_NAME_DEF_STMT (return_val); phi; phi = PHI_CHAIN (phi)) + if (PHI_RESULT (phi) == return_val) + break; if (!phi) return; phi_num_args = PHI_NUM_ARGS (phi); diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index 9346d6cf7065..99b9627c2070 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -53,15 +53,13 @@ Boston, MA 02111-1307, USA. */ edge ssa_redirect_edge (edge e, basic_block dest) { - tree phi, next; + tree phi; tree list = NULL, *last = &list; tree src, dst, node; /* Remove the appropriate PHI arguments in E's destination block. */ - for (phi = phi_nodes (e->dest); phi; phi = next) + for (phi = phi_nodes (e->dest); phi; phi = PHI_CHAIN (phi)) { - next = PHI_CHAIN (phi); - if (PHI_ARG_DEF (phi, e->dest_idx) == NULL_TREE) continue; -- 2.47.3