tree-if-conv.c (replace_phi_with_cond_modify_expr): Use EDGE_PRED instead of PHI_ARG_...

	* tree-if-conv.c (replace_phi_with_cond_modify_expr): Use
	EDGE_PRED instead of PHI_ARG_EDGE.
	* tree-ssa-live.c: Likewise.
	* tree-ssa-loop-manip.c: Likewise.
	* tree-ssa.c: Likewise.

From-SVN: r91473

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4a65e98b915cc0da0eeb7af6d12fe96421d0e34f..5b5606469a9ff1fc006d1cb5f68c262288d67a98 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-29  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * tree-if-conv.c (replace_phi_with_cond_modify_expr): Use
+       EDGE_PRED instead of PHI_ARG_EDGE.
+       * tree-ssa-live.c: Likewise.
+       * tree-ssa-loop-manip.c: Likewise.
+       * tree-ssa.c: Likewise.
+
 2004-11-29  Alan Modra  <amodra@bigpond.net.au>
 
        * varasm.c (default_elf_select_section_1): Only pass DECL_P decl

diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index 0eee6d9acafd49db1b101ee497d9b5fad5d61755..36e9c758b53322711153033fcc6cd64859ba7093 100644 (file)
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -757,7 +757,7 @@ replace_phi_with_cond_modify_expr (tree phi, tree cond, basic_block true_bb,
   arg_1 = NULL_TREE;
 
   /* Use condition that is not TRUTH_NOT_EXPR in conditional modify expr.  */
-  if (PHI_ARG_EDGE(phi, 1)->src == true_bb)
+  if (EDGE_PRED (bb, 1)->src == true_bb)
     {
       arg_0 = PHI_ARG_DEF (phi, 1);
       arg_1 = PHI_ARG_DEF (phi, 0);

diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 554a0397a32dfbc18adf7bd0c91f5fe812ddd0c5..15c8b4820828cf152f7118dccbf106a54fafb28b 100644 (file)
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -589,7 +589,7 @@ calculate_live_on_entry (var_map map)
              if (!phi_ssa_name_p (var))
                continue;
              stmt = SSA_NAME_DEF_STMT (var);
-             e = PHI_ARG_EDGE (phi, i);
+             e = EDGE_PRED (bb, i);
 
              /* Any uses in PHIs which either don't have def's or are not
                 defined in the block from which the def comes, will be live

diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 01c75c87cfa9dd88a042853fd8095981ba2e5de5..fe9c43c58605a819f5d1f55bc86d27f91cad9261 100644 (file)
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -274,7 +274,7 @@ find_uses_to_rename (bitmap *use_blocks)
     {
       for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
        for (i = 0; i < (unsigned) PHI_NUM_ARGS (phi); i++)
-         find_uses_to_rename_use (PHI_ARG_EDGE (phi, i)->src,
+         find_uses_to_rename_use (EDGE_PRED (bb, i)->src,
                                   PHI_ARG_DEF (phi, i), use_blocks);
 
       for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))

diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index f9c536211f80759746b5e4fdb631c702b24d22bd..24b5697f2203b11292d38427cf9fe8c3610146e0 100644 (file)
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -289,7 +289,7 @@ verify_phi_args (tree phi, basic_block bb, basic_block *definition_block)
     {
       tree op = PHI_ARG_DEF (phi, i);
 
-      e = PHI_ARG_EDGE (phi, i);
+      e = EDGE_PRED (bb, i);
 
       if (op == NULL_TREE)
        {