diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7e8f482e275..de89cb01468 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,12 +1,18 @@
+2004-11-14  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* tree-cfg.c, tree-if-conv.c, tree-ssa-loop-ivopts.c,
+	tree-ssa-loop-manip.c, tree-vectorizer.c: Replace TREE_CHAIN
+	with PHI_CHAIN where appropriate.
+
 2004-11-13  Dale Johannesen  <dalej@apple.com>
 
-	* tree-flow.h (bsi_commit_one_edge_insert):  Remove name from prototype.
-	(tree_block_label):  Ditto.
-	(flush_pending_stmts):  Ditto.
-	(insert_edge_copies):  Ditto.
-	(expr_invariant_in_loop_p):  Ditto.
-	(TDF_USE_OPS):  Parenthesize definition.
-	(TDF_USE_VOPS):  Ditto.
+	* tree-flow.h (bsi_commit_one_edge_insert): Remove name from prototype.
+	(tree_block_label): Ditto.
+	(flush_pending_stmts): Ditto.
+	(insert_edge_copies): Ditto.
+	(expr_invariant_in_loop_p): Ditto.
+	(TDF_USE_OPS): Parenthesize definition.
+	(TDF_USE_VOPS): Ditto.
 
 2004-11-13  David Edelsohn  <edelsohn@gnu.org>
 
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 9136efee7ba..b27f872b427 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -4515,9 +4515,9 @@ add_phi_args_after_copy_bb (basic_block bb_copy)
 
       for (phi = phi_nodes (e->dest), phi_copy = phi_nodes (e_copy->dest);
 	   phi;
-	   phi = phi_next, phi_copy = TREE_CHAIN (phi_copy))
+	   phi = phi_next, phi_copy = PHI_CHAIN (phi_copy))
 	{
-	  phi_next = TREE_CHAIN (phi);
+	  phi_next = PHI_CHAIN (phi);
 
 	  gcc_assert (PHI_RESULT (phi) == PHI_RESULT (phi_copy));
 	  def = PHI_ARG_DEF_FROM_EDGE (phi, e);
diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c
index ce247fcbde8..ce07166c6ae 100644
--- a/gcc/tree-if-conv.c
+++ b/gcc/tree-if-conv.c
@@ -824,7 +824,7 @@ process_phi_nodes (struct loop *loop)
 
       while (phi)
 	{
-	  tree next = TREE_CHAIN (phi);
+	  tree next = PHI_CHAIN (phi);
 	  replace_phi_with_cond_modify_expr (phi, cond, true_bb, &bsi);
 	  release_phi_node (phi);
 	  phi = next;
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 417c4635943..867f72d0668 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -4659,7 +4659,7 @@ compute_phi_arg_on_exit (edge exit, tree stmts, tree op)
 
   for (phi = phi_nodes (exit->dest); phi; phi = next)
     {
-      next = TREE_CHAIN (phi);
+      next = PHI_CHAIN (phi);
 
       if (PHI_ARG_DEF_FROM_EDGE (phi, exit) == op)
 	{
diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index 22324949e9b..43499560e54 100644
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -665,7 +665,7 @@ lv_adjust_loop_header_phi (basic_block first, basic_block second,
 
   for (phi2 = phi_nodes (second), phi1 = phi_nodes (first); 
        phi2 && phi1; 
-       phi2 = TREE_CHAIN (phi2),  phi1 = TREE_CHAIN (phi1))
+       phi2 = PHI_CHAIN (phi2),  phi1 = PHI_CHAIN (phi1))
     {
       int i;
       for (i = 0; i < PHI_NUM_ARGS (phi2); i++)
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 0c29a34251e..e1095f579be 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -482,7 +482,7 @@ update_phis_for_duplicate_loop (struct loop *loop,
   for (phi_new = phi_nodes (new_loop->header),
        phi_old = phi_nodes (loop->header);
        phi_new && phi_old;
-       phi_new = TREE_CHAIN (phi_new), phi_old = TREE_CHAIN (phi_old))
+       phi_new = PHI_CHAIN (phi_new), phi_old = PHI_CHAIN (phi_old))
     {
       def = PHI_ARG_DEF_FROM_EDGE (phi_old, old_latch);
 
@@ -577,7 +577,7 @@ update_phi_nodes_for_guard (edge guard_true_edge, struct loop * loop)
 	/* Update all phi nodes at the loop exit successor.  */
 	for (phi1 = phi_nodes (EDGE_SUCC (bb, 0)->dest); 
 	     phi1; 
-	     phi1 = TREE_CHAIN (phi1))
+	     phi1 = PHI_CHAIN (phi1))
 	  {
 	    tree old_arg = PHI_ARG_DEF_FROM_EDGE (phi1, EDGE_SUCC (bb, 0));
 	    if (old_arg == phi_arg)