diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index af10e692f11..6c7d937c6f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2006-02-23  Jeff Law  <law@redhat.com>
 
+	* tree.h (PHI_ARG_NONZERO): Remove.
+	* tree-phinodes.c (add_phi_arg): No longer initialize PHI_ARG_NONZERO.
+	(remove_phi_arg_num): No longer copy PHI_ARG_NONZERO from the old
+	node to the new node.
+
 	PR tree-optimization/26425
 	* tree-vrp.c (vrp_visit_assignment): If the LHS's type has a NULL
 	min/max, then assume its varying.
diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c
index b7cfcb20c08..75e76308470 100644
--- a/gcc/tree-phinodes.c
+++ b/gcc/tree-phinodes.c
@@ -392,7 +392,6 @@ add_phi_arg (tree phi, tree def, edge e)
     }
 
   SET_PHI_ARG_DEF (phi, e->dest_idx, def);
-  PHI_ARG_NONZERO (phi, e->dest_idx) = false;
 }
 
 /* Remove the Ith argument from PHI's argument list.  This routine
@@ -415,13 +414,11 @@ remove_phi_arg_num (tree phi, int i)
   if (i != num_elem - 1)
     {
       SET_PHI_ARG_DEF (phi, i, PHI_ARG_DEF (phi, num_elem - 1));
-      PHI_ARG_NONZERO (phi, i) = PHI_ARG_NONZERO (phi, num_elem - 1);
     }
 
   /* Shrink the vector and return.  Note that we do not have to clear
-     PHI_ARG_DEF or PHI_ARG_NONZERO because the garbage collector will
-     not look at those elements beyond the first PHI_NUM_ARGS elements
-     of the array.  */
+     PHI_ARG_DEF because the garbage collector will not look at those
+     elements beyond the first PHI_NUM_ARGS elements of the array.  */
   PHI_NUM_ARGS (phi)--;
 }
 
diff --git a/gcc/tree.h b/gcc/tree.h
index 76e76127a2b..4dc2f7908ec 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1737,7 +1737,6 @@ struct tree_ssa_name GTY(())
 #define PHI_ARG_CAPACITY(NODE)		PHI_NODE_CHECK (NODE)->phi.capacity
 #define PHI_ARG_ELT(NODE, I)		PHI_NODE_ELT_CHECK (NODE, I)
 #define PHI_ARG_EDGE(NODE, I) 		(EDGE_PRED (PHI_BB ((NODE)), (I)))
-#define PHI_ARG_NONZERO(NODE, I) 	PHI_NODE_ELT_CHECK (NODE, I).nonzero
 #define PHI_BB(NODE)			PHI_NODE_CHECK (NODE)->phi.bb
 #define PHI_ARG_IMM_USE_NODE(NODE, I)	PHI_NODE_ELT_CHECK (NODE, I).imm_use