predict.c (apply_return_prediction): Standardize PHI chain walking.

	* predict.c (apply_return_prediction): Standardize PHI chain
	walking.
	* tree-ssa.c (ssa_redirect_edge): Likewise.

From-SVN: r95930

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd96cf9a02c3de53544d3fd34c12f8270e2cb351..6077f1a9bfb1b847c3e13647caf0aab5e4c96c47 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-05  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * predict.c (apply_return_prediction): Standardize PHI chain
+       walking.
+       * tree-ssa.c (ssa_redirect_edge): Likewise.
+
 2005-03-05  Richard Sandiford  <rsandifo@redhat.com>
 
        * doc/invoke.texi: Document new MIPS -msym32 and -mno-sym32 options.

diff --git a/gcc/predict.c b/gcc/predict.c
index bf594acfc92a392d0d71145c0b20d53f16698e62..9a00f0bb15fe412ba1e791c30f57212c7ebf3458 100644 (file)
--- 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 9346d6cf7065425debbaf304d132a92db5073dff..99b9627c2070fa463513e0510375c74360d9ce29 100644 (file)
--- 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;