* gimplify.c (mostly_copy_tree_r): Don't attempt to copy decls.

[pf3gnuchains/gcc-fork.git] / gcc / print-tree.c

diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 14a7021..1d8ca96 100644 (file)
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -245,18 +245,19 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
        indent_to (file, indent + 3);
     }
 
-  if (TREE_SIDE_EFFECTS (node))
+  if (!TYPE_P (node) && TREE_SIDE_EFFECTS (node))
     fputs (" side-effects", file);
-  if (TREE_READONLY (node))
+
+  if (TYPE_P (node) ? TYPE_READONLY (node) : TREE_READONLY (node))
     fputs (" readonly", file);
-  if (TREE_CONSTANT (node))
+  if (!TYPE_P (node) && TREE_CONSTANT (node))
     fputs (" constant", file);
+  if (TREE_INVARIANT (node))
+    fputs (" invariant", file);
   if (TREE_ADDRESSABLE (node))
     fputs (" addressable", file);
   if (TREE_THIS_VOLATILE (node))
     fputs (" volatile", file);
-  if (TREE_UNSIGNED (node))
-    fputs (" unsigned", file);
   if (TREE_ASM_WRITTEN (node))
     fputs (" asm_written", file);
   if (TREE_USED (node))
@@ -273,6 +274,8 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
     fputs (" static", file);
   if (TREE_DEPRECATED (node))
     fputs (" deprecated", file);
+  if (TREE_VISITED (node))
+    fputs (" visited", file);
   if (TREE_LANG_FLAG_0 (node))
     fputs (" tree_0", file);
   if (TREE_LANG_FLAG_1 (node))
@@ -295,6 +298,8 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
     case 'd':
       mode = DECL_MODE (node);
 
+      if (DECL_UNSIGNED (node))
+       fputs (" unsigned", file);
       if (DECL_IGNORED_P (node))
        fputs (" ignored", file);
       if (DECL_ABSTRACT (node))
@@ -455,6 +460,9 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       break;
 
     case 't':
+      if (TYPE_UNSIGNED (node))
+       fputs (" unsigned", file);
+
       /* The no-force-blk flag is used for different things in
         different types.  */
       if ((TREE_CODE (node) == RECORD_TYPE
@@ -561,21 +569,16 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
-    case 'b':
-      print_node (file, "vars", BLOCK_VARS (node), indent + 4);
-      print_node (file, "supercontext", BLOCK_SUPERCONTEXT (node), indent + 4);
-      print_node (file, "subblocks", BLOCK_SUBBLOCKS (node), indent + 4);
-      print_node (file, "chain", BLOCK_CHAIN (node), indent + 4);
-      print_node (file, "abstract_origin",
-                 BLOCK_ABSTRACT_ORIGIN (node), indent + 4);
-      break;
-
     case 'e':
     case '<':
     case '1':
     case '2':
     case 'r':
     case 's':
+      if (TREE_CODE (node) == BIT_FIELD_REF && BIT_FIELD_REF_UNSIGNED (node))
+       fputs (" unsigned", file);
+      else if (TREE_CODE (node) == SAVE_EXPR && SAVE_EXPR_NOPLACEHOLDER (node))
+       fputs (" noplaceholder", file);
       if (TREE_CODE (node) == BIND_EXPR)
        {
          print_node (file, "vars", TREE_OPERAND (node, 0), indent + 4);
@@ -611,14 +614,6 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
            }
        }
 
-      if (TREE_CODE (node) == EXPR_WITH_FILE_LOCATION)
-       {
-         indent_to (file, indent+4);
-         fprintf (file, "%s:%d:%d",
-                  (EXPR_WFL_FILENAME_NODE (node ) ?
-                   EXPR_WFL_FILENAME (node) : "(no file info)"),
-                  EXPR_WFL_LINENO (node), EXPR_WFL_COLNO (node));
-       }
       print_node (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
@@ -729,6 +724,16 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
              }
          break;
 
+       case BLOCK:
+         print_node (file, "vars", BLOCK_VARS (node), indent + 4);
+         print_node (file, "supercontext", BLOCK_SUPERCONTEXT (node),
+                     indent + 4);
+         print_node (file, "subblocks", BLOCK_SUBBLOCKS (node), indent + 4);
+         print_node (file, "chain", BLOCK_CHAIN (node), indent + 4);
+         print_node (file, "abstract_origin",
+                     BLOCK_ABSTRACT_ORIGIN (node), indent + 4);
+         break;
+
        default:
          if (TREE_CODE_CLASS (TREE_CODE (node)) == 'x')
            lang_hooks.print_xnode (file, node, indent);
@@ -738,5 +743,13 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       break;
     }
 
+  if (EXPR_HAS_LOCATION (node))
+    {
+      indent_to (file, indent+4);
+      fprintf (file, "%s:%d",
+              EXPR_FILENAME (node),
+              EXPR_LINENO (node));
+    }
+
   fprintf (file, ">");
 }