Index: tree-pass.h
===================================================================
*** tree-pass.h	(revision 111225)
--- tree-pass.h	(working copy)
*************** enum tree_dump_index
*** 68,75 ****
  #define TDF_STMTADDR	(1 << 12)	/* Address of stmt.  */
  
  #define TDF_GRAPH	(1 << 13)	/* a graph dump is being emitted */
- #define TDF_CHAIN	(1 << 14)	/* Follow TREE_CHAIN when
- 					   dumping *_DECLs.  */
  
  extern char *get_dump_file_name (enum tree_dump_index);
  extern int dump_enabled_p (enum tree_dump_index);
--- 68,73 ----
Index: tree-pretty-print.c
===================================================================
*** tree-pretty-print.c	(revision 111225)
--- tree-pretty-print.c	(working copy)
*************** debug_generic_stmt (tree t)
*** 101,107 ****
  void
  debug_tree_chain (tree t)
  {
!   print_generic_expr (stderr, t, TDF_VOPS|TDF_UID|TDF_CHAIN);
    fprintf (stderr, "\n");
  }
  
--- 101,112 ----
  void
  debug_tree_chain (tree t)
  {
!   while (t)
!   {
!     print_generic_expr (stderr, t, TDF_VOPS|TDF_UID);
!     fprintf(stderr, " ");
!     t = TREE_CHAIN (t);
!   }
    fprintf (stderr, "\n");
  }
  
*************** dump_decl_name (pretty_printer *buffer, 
*** 160,191 ****
  {
    tree t = node;
  
!   while (t)
!     {
!       if (DECL_NAME (t))
! 	pp_tree_identifier (buffer, DECL_NAME (t));
! 
!       if ((flags & TDF_UID)
! 	  || DECL_NAME (t) == NULL_TREE)
! 	{
! 	  if (TREE_CODE (t) == LABEL_DECL
! 	      && LABEL_DECL_UID (t) != -1)
! 	    pp_printf (buffer, "L." HOST_WIDE_INT_PRINT_DEC,
! 		LABEL_DECL_UID (t));
! 	  else
! 	    {
! 	      char c = TREE_CODE (t) == CONST_DECL ? 'C' : 'D';
! 	      pp_printf (buffer, "%c.%u", c, DECL_UID (t));
! 	    }
! 	}
! 
!       if (flags & TDF_CHAIN)
  	{
! 	  t = TREE_CHAIN (t);
! 	  pp_string (buffer, " ");
  	}
-       else
- 	t = NULL_TREE;
      }
  }
  
--- 165,184 ----
  {
    tree t = node;
  
!   if (DECL_NAME (t))
!     pp_tree_identifier (buffer, DECL_NAME (t));
!   if ((flags & TDF_UID)
!       || DECL_NAME (t) == NULL_TREE)
!     {
!       if (TREE_CODE (t) == LABEL_DECL
!           && LABEL_DECL_UID (t) != -1)
!         pp_printf (buffer, "L." HOST_WIDE_INT_PRINT_DEC,
! 		   LABEL_DECL_UID (t));
!       else
  	{
! 	  char c = TREE_CODE (t) == CONST_DECL ? 'C' : 'D';
! 	  pp_printf (buffer, "%c.%u", c, DECL_UID (t));
  	}
      }
  }