Use the stock [3.1-snap] file.

1 files changed, 167 insertions, 107 deletions

diff --git a/contrib/gcc/print-tree.c b/contrib/gcc/print-tree.c
index 7b29454..33236cf 100644
--- a/contrib/gcc/print-tree.c
+++ b/contrib/gcc/print-tree.c
@@ -1,22 +1,23 @@
 /* Prints out tree in human readable form - GNU C-compiler
-   Copyright (C) 1990, 91, 93-97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
 /* $FreeBSD$ */
 
@@ -24,11 +25,8 @@ Boston, MA 02111-1307, USA.  */
 #include "config.h"
 #include "system.h"
 #include "tree.h"
-
-extern char *mode_name[];
-
-void print_node ();
-void indent_to ();
+#include "ggc.h"
+#include "langhooks.h"
 
 /* Define the hash table of nodes already seen.
    Such nodes are not repeated; brief cross-references are used.  */
@@ -51,13 +49,10 @@ void
 debug_tree (node)
      tree node;
 {
-  char *object = (char *) oballoc (0);
-
-  table = (struct bucket **) oballoc (HASH_SIZE * sizeof (struct bucket *));
-  bzero ((char *) table, HASH_SIZE * sizeof (struct bucket *));
+  table = (struct bucket **) permalloc (HASH_SIZE * sizeof (struct bucket *));
+  memset ((char *) table, 0, HASH_SIZE * sizeof (struct bucket *));
   print_node (stderr, "", node, 0);
   table = 0;
-  obfree (object);
   fprintf (stderr, "\n");
 }
 
@@ -103,7 +98,8 @@ print_node_brief (file, prefix, node, indent)
     }
   if (TREE_CODE (node) == IDENTIFIER_NODE)
     fprintf (file, " %s", IDENTIFIER_POINTER (node));
-  /* We might as well always print the value of an integer.  */
+
+  /* We might as well always print the value of an integer or real.  */
   if (TREE_CODE (node) == INTEGER_CST)
     {
       if (TREE_CONSTANT_OVERFLOW (node))
@@ -117,7 +113,7 @@ print_node_brief (file, prefix, node, indent)
 	{
 	  fprintf (file, "-");
 	  fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
-		 -TREE_INT_CST_LOW (node));
+		   -TREE_INT_CST_LOW (node));
 	}
       else
 	fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
@@ -229,7 +225,7 @@ print_node (file, prefix, node, indent)
       }
 
   /* Add this node to the table.  */
-  b = (struct bucket *) oballoc (sizeof (struct bucket));
+  b = (struct bucket *) permalloc (sizeof (struct bucket));
   b->node = node;
   b->next = table[hash];
   table[hash] = b;
@@ -272,19 +268,6 @@ print_node (file, prefix, node, indent)
       print_node (file, "type", TREE_TYPE (node), indent + 4);
       if (TREE_TYPE (node))
 	indent_to (file, indent + 3);
-
-      print_obstack_name ((char *) node, file, "");
-      indent_to (file, indent + 3);
-    }
-
-  /* If a permanent object is in the wrong obstack, or the reverse, warn.  */
-  if (object_permanent_p (node) != TREE_PERMANENT (node))
-    {
-      if (TREE_PERMANENT (node))
-	fputs (" !!permanent object in non-permanent obstack!!", file);
-      else
-	fputs (" !!non-permanent object in permanent obstack!!", file);
-      indent_to (file, indent + 3);
     }
 
   if (TREE_SIDE_EFFECTS (node))
@@ -303,14 +286,18 @@ print_node (file, prefix, node, indent)
     fputs (" asm_written", file);
   if (TREE_USED (node))
     fputs (" used", file);
-  if (TREE_RAISES (node))
-    fputs (" raises", file);
-  if (TREE_PERMANENT (node))
-    fputs (" permanent", file);
+  if (TREE_NOTHROW (node))
+    fputs (" nothrow", file);
   if (TREE_PUBLIC (node))
     fputs (" public", file);
+  if (TREE_PRIVATE (node))
+    fputs (" private", file);
+  if (TREE_PROTECTED (node))
+    fputs (" protected", file);
   if (TREE_STATIC (node))
     fputs (" static", file);
+  if (TREE_DEPRECATED (node))
+    fputs (" deprecated", file);
   if (TREE_LANG_FLAG_0 (node))
     fputs (" tree_0", file);
   if (TREE_LANG_FLAG_1 (node))
@@ -343,36 +330,47 @@ print_node (file, prefix, node, indent)
 	fputs (" common", file);
       if (DECL_EXTERNAL (node))
 	fputs (" external", file);
-      if (DECL_REGISTER (node))
+      if (DECL_REGISTER (node) && TREE_CODE (node) != FIELD_DECL
+	  && TREE_CODE (node) != FUNCTION_DECL
+	  && TREE_CODE (node) != LABEL_DECL)
 	fputs (" regdecl", file);
-      if (DECL_PACKED (node))
-	fputs (" packed", file);
       if (DECL_NONLOCAL (node))
 	fputs (" nonlocal", file);
-      if (DECL_INLINE (node))
-	fputs (" inline", file);
 
       if (TREE_CODE (node) == TYPE_DECL && TYPE_DECL_SUPPRESS_DEBUG (node))
 	fputs (" suppress-debug", file);
 
+      if (TREE_CODE (node) == FUNCTION_DECL && DECL_INLINE (node))
+	fputs (" inline", file);
       if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN (node))
 	fputs (" built-in", file);
       if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN_NONANSI (node))
 	fputs (" built-in-nonansi", file);
+      if (TREE_CODE (node) == FUNCTION_DECL && DECL_NO_STATIC_CHAIN (node))
+	fputs (" no-static-chain", file);
 
+      if (TREE_CODE (node) == FIELD_DECL && DECL_PACKED (node))
+	fputs (" packed", file);
       if (TREE_CODE (node) == FIELD_DECL && DECL_BIT_FIELD (node))
 	fputs (" bit-field", file);
+      if (TREE_CODE (node) == FIELD_DECL && DECL_NONADDRESSABLE_P (node))
+	fputs (" nonaddressable", file);
+
       if (TREE_CODE (node) == LABEL_DECL && DECL_TOO_LATE (node))
 	fputs (" too-late", file);
+      if (TREE_CODE (node) == LABEL_DECL && DECL_ERROR_ISSUED (node))
+	fputs (" error-issued", file);
+
       if (TREE_CODE (node) == VAR_DECL && DECL_IN_TEXT_SECTION (node))
 	fputs (" in-text-section", file);
 
+      if (TREE_CODE (node) == PARM_DECL && DECL_TRANSPARENT_UNION (node))
+	fputs (" transparent-union", file);
+
       if (DECL_VIRTUAL_P (node))
 	fputs (" virtual", file);
       if (DECL_DEFER_OUTPUT (node))
 	fputs (" defer-output", file);
-      if (DECL_TRANSPARENT_UNION (node))
-	fputs (" transparent-union", file);
 
       if (DECL_LANG_FLAG_0 (node))
 	fputs (" decl_0", file);
@@ -391,54 +389,91 @@ print_node (file, prefix, node, indent)
       if (DECL_LANG_FLAG_7 (node))
 	fputs (" decl_7", file);
 
-      fprintf (file, " %s", mode_name[(int) mode]);
-
+      fprintf (file, " %s", GET_MODE_NAME (mode));
       fprintf (file, " file %s line %d",
 	       DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node));
 
       print_node (file, "size", DECL_SIZE (node), indent + 4);
-      indent_to (file, indent + 3);
+      print_node (file, "unit size", DECL_SIZE_UNIT (node), indent + 4);
+      
+      if (TREE_CODE (node) != FUNCTION_DECL
+	  || DECL_INLINE (node) || DECL_BUILT_IN (node))
+	indent_to (file, indent + 3);
+
       if (TREE_CODE (node) != FUNCTION_DECL)
-	fprintf (file, " align %d", DECL_ALIGN (node));
-      else if (DECL_INLINE (node))
-	fprintf (file, " frame_size %d", DECL_FRAME_SIZE (node));
+	{
+	  if (DECL_USER_ALIGN (node))
+	    fprintf (file, " user");
+
+	  fprintf (file, " align %d", DECL_ALIGN (node));
+	  if (TREE_CODE (node) == FIELD_DECL)
+	    {
+	      fprintf (file, " offset_align ");
+	      fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
+		       DECL_OFFSET_ALIGN (node));
+	    }
+	}
       else if (DECL_BUILT_IN (node))
-	fprintf (file, " built-in code %d", DECL_FUNCTION_CODE (node));
-      if (TREE_CODE (node) == FIELD_DECL)
-	print_node (file, "bitpos", DECL_FIELD_BITPOS (node), indent + 4);
+	{
+	  if (DECL_BUILT_IN_CLASS (node) == BUILT_IN_MD)
+	    fprintf (file, " built-in BUILT_IN_MD %d", DECL_FUNCTION_CODE (node));
+	  else
+	    fprintf (file, " built-in %s:%s",
+		     built_in_class_names[(int) DECL_BUILT_IN_CLASS (node)],
+		     built_in_names[(int) DECL_FUNCTION_CODE (node)]);
+	}
+
       if (DECL_POINTER_ALIAS_SET_KNOWN_P (node))
-	fprintf (file, " alias set %d", DECL_POINTER_ALIAS_SET (node));
+	{
+	  fprintf (file, " alias set ");
+	  fprintf (file, HOST_WIDE_INT_PRINT_DEC, 
+		   DECL_POINTER_ALIAS_SET (node));
+	}
+
+      if (TREE_CODE (node) == FIELD_DECL)
+	{
+	  print_node (file, "offset", DECL_FIELD_OFFSET (node), indent + 4);
+	  print_node (file, "bit offset", DECL_FIELD_BIT_OFFSET (node),
+		      indent + 4);
+	}
+
       print_node_brief (file, "context", DECL_CONTEXT (node), indent + 4);
-      print_node_brief (file, "machine_attributes", DECL_MACHINE_ATTRIBUTES (node), indent + 4);
+      print_node_brief (file, "attributes",
+			DECL_ATTRIBUTES (node), indent + 4);
       print_node_brief (file, "abstract_origin",
 			DECL_ABSTRACT_ORIGIN (node), indent + 4);
 
       print_node (file, "arguments", DECL_ARGUMENTS (node), indent + 4);
-      print_node (file, "result", DECL_RESULT (node), indent + 4);
+      print_node (file, "result", DECL_RESULT_FLD (node), indent + 4);
       print_node_brief (file, "initial", DECL_INITIAL (node), indent + 4);
 
-      print_lang_decl (file, node, indent);
+      (*lang_hooks.print_decl) (file, node, indent);
 
-      if (DECL_RTL (node) != 0)
+      if (DECL_RTL_SET_P (node))
 	{
 	  indent_to (file, indent + 4);
 	  print_rtl (file, DECL_RTL (node));
 	}
 
-      if (DECL_SAVED_INSNS (node) != 0)
+      if (TREE_CODE (node) == PARM_DECL)
 	{
-	  indent_to (file, indent + 4);
-	  if (TREE_CODE (node) == PARM_DECL)
+	  print_node (file, "arg-type", DECL_ARG_TYPE (node), indent + 4);
+	  print_node (file, "arg-type-as-written",
+		      DECL_ARG_TYPE_AS_WRITTEN (node), indent + 4);
+
+	  if (DECL_INCOMING_RTL (node) != 0)
 	    {
+	      indent_to (file, indent + 4);
 	      fprintf (file, "incoming-rtl ");
 	      print_rtl (file, DECL_INCOMING_RTL (node));
 	    }
-	  else if (TREE_CODE (node) == FUNCTION_DECL)
-	    {
-	      fprintf (file, "saved-insns ");
-	      fprintf (file, HOST_PTR_PRINTF,
- 		       (char *) DECL_SAVED_INSNS (node));
-	    }
+	}
+      else if (TREE_CODE (node) == FUNCTION_DECL
+	       && DECL_SAVED_INSNS (node) != 0)
+	{
+	  indent_to (file, indent + 4);
+	  fprintf (file, "saved-insns ");
+	  fprintf (file, HOST_PTR_PRINTF, (char *) DECL_SAVED_INSNS (node));
 	}
 
       /* Print the decl chain only if decl is at second level.  */
@@ -449,14 +484,36 @@ print_node (file, prefix, node, indent)
       break;
 
     case 't':
-      if (TYPE_NO_FORCE_BLK (node))
+      /* The no-force-blk flag is used for different things in
+	 different types.  */
+      if ((TREE_CODE (node) == RECORD_TYPE
+	   || TREE_CODE (node) == UNION_TYPE
+	   || TREE_CODE (node) == QUAL_UNION_TYPE)
+	  && TYPE_NO_FORCE_BLK (node))
 	fputs (" no-force-blk", file);
+      else if (TREE_CODE (node) == INTEGER_TYPE
+	       && TYPE_IS_SIZETYPE (node))
+	fputs (" sizetype", file);
+      else if (TREE_CODE (node) == FUNCTION_TYPE
+	       && TYPE_RETURNS_STACK_DEPRESSED (node))
+	fputs (" returns-stack-depressed", file);
+
       if (TYPE_STRING_FLAG (node))
 	fputs (" string-flag", file);
       if (TYPE_NEEDS_CONSTRUCTING (node))
 	fputs (" needs-constructing", file);
-      if (TYPE_TRANSPARENT_UNION (node))
+
+      /* The transparent-union flag is used for different things in
+	 different nodes.  */
+      if (TREE_CODE (node) == UNION_TYPE && TYPE_TRANSPARENT_UNION (node))
 	fputs (" transparent-union", file);
+      else if (TREE_CODE (node) == ARRAY_TYPE
+	       && TYPE_NONALIASED_COMPONENT (node))
+	fputs (" nonaliased-component", file);
+      else if (TREE_CODE (node) == FUNCTION_TYPE
+	       && TYPE_AMBIENT_BOUNDEDNESS (node))
+	fputs (" ambient-boundedness", file);
+
       if (TYPE_PACKED (node))
 	fputs (" packed", file);
 
@@ -476,61 +533,66 @@ print_node (file, prefix, node, indent)
 	fputs (" type_6", file);
 
       mode = TYPE_MODE (node);
-      fprintf (file, " %s", mode_name[(int) mode]);
+      fprintf (file, " %s", GET_MODE_NAME (mode));
 
       print_node (file, "size", TYPE_SIZE (node), indent + 4);
+      print_node (file, "unit size", TYPE_SIZE_UNIT (node), indent + 4);
       indent_to (file, indent + 3);
 
+      if (TYPE_USER_ALIGN (node))
+	fprintf (file, " user");
+
       fprintf (file, " align %d", TYPE_ALIGN (node));
       fprintf (file, " symtab %d", TYPE_SYMTAB_ADDRESS (node));
-      fprintf (file, " alias set %d", TYPE_ALIAS_SET (node));
+      fprintf (file, " alias set ");
+      fprintf (file, HOST_WIDE_INT_PRINT_DEC, TYPE_ALIAS_SET (node));
 
       print_node (file, "attributes", TYPE_ATTRIBUTES (node), indent + 4);
 
-      if (TREE_CODE (node) == ARRAY_TYPE || TREE_CODE (node) == SET_TYPE)
-	print_node (file, "domain", TYPE_DOMAIN (node), indent + 4);
-      else if (TREE_CODE (node) == INTEGER_TYPE
-	       || TREE_CODE (node) == BOOLEAN_TYPE
-	       || TREE_CODE (node) == CHAR_TYPE)
-	{
-	  fprintf (file, " precision %d", TYPE_PRECISION (node));
-	  print_node (file, "min", TYPE_MIN_VALUE (node), indent + 4);
-	  print_node (file, "max", TYPE_MAX_VALUE (node), indent + 4);
-	}
-      else if (TREE_CODE (node) == ENUMERAL_TYPE)
+      if (INTEGRAL_TYPE_P (node) || TREE_CODE (node) == REAL_TYPE)
 	{
 	  fprintf (file, " precision %d", TYPE_PRECISION (node));
-	  print_node (file, "min", TYPE_MIN_VALUE (node), indent + 4);
-	  print_node (file, "max", TYPE_MAX_VALUE (node), indent + 4);
-	  print_node (file, "values", TYPE_VALUES (node), indent + 4);
+	  print_node_brief (file, "min", TYPE_MIN_VALUE (node), indent + 4);
+	  print_node_brief (file, "max", TYPE_MAX_VALUE (node), indent + 4);
 	}
-      else if (TREE_CODE (node) == REAL_TYPE)
-	fprintf (file, " precision %d", TYPE_PRECISION (node));
+
+      if (TREE_CODE (node) == ENUMERAL_TYPE)
+	print_node (file, "values", TYPE_VALUES (node), indent + 4);
+      else if (TREE_CODE (node) == ARRAY_TYPE || TREE_CODE (node) == SET_TYPE)
+	print_node (file, "domain", TYPE_DOMAIN (node), indent + 4);
       else if (TREE_CODE (node) == RECORD_TYPE
 	       || TREE_CODE (node) == UNION_TYPE
 	       || TREE_CODE (node) == QUAL_UNION_TYPE)
 	print_node (file, "fields", TYPE_FIELDS (node), indent + 4);
-      else if (TREE_CODE (node) == FUNCTION_TYPE || TREE_CODE (node) == METHOD_TYPE)
+      else if (TREE_CODE (node) == FUNCTION_TYPE
+	       || TREE_CODE (node) == METHOD_TYPE)
 	{
 	  if (TYPE_METHOD_BASETYPE (node))
-	    print_node_brief (file, "method basetype", TYPE_METHOD_BASETYPE (node), indent + 4);
+	    print_node_brief (file, "method basetype",
+			      TYPE_METHOD_BASETYPE (node), indent + 4);
 	  print_node (file, "arg-types", TYPE_ARG_TYPES (node), indent + 4);
 	}
+      else if (TREE_CODE (node) == OFFSET_TYPE)
+	print_node_brief (file, "basetype", TYPE_OFFSET_BASETYPE (node),
+			  indent + 4);
+
       if (TYPE_CONTEXT (node))
 	print_node_brief (file, "context", TYPE_CONTEXT (node), indent + 4);
 
-      print_lang_type (file, node, indent);
+      (*lang_hooks.print_type) (file, node, indent);
 
       if (TYPE_POINTER_TO (node) || TREE_CHAIN (node))
 	indent_to (file, indent + 3);
-      print_node_brief (file, "pointer_to_this", TYPE_POINTER_TO (node), indent + 4);
-      print_node_brief (file, "reference_to_this", TYPE_REFERENCE_TO (node), indent + 4);
+
+      print_node_brief (file, "pointer_to_this", TYPE_POINTER_TO (node),
+			indent + 4);
+      print_node_brief (file, "reference_to_this", TYPE_REFERENCE_TO (node),
+			indent + 4);
       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, "tags", BLOCK_TYPE_TAGS (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);
@@ -552,10 +614,12 @@ print_node (file, prefix, node, indent)
 	  break;
 	}
 
-      len = tree_code_length[(int) TREE_CODE (node)];
+      len = TREE_CODE_LENGTH (TREE_CODE (node));
+
       /* Some nodes contain rtx's, not trees,
 	 after a certain point.  Print the rtx's as rtx's.  */
       first_rtl = first_rtl_op (TREE_CODE (node));
+
       for (i = 0; i < len; i++)
 	{
 	  if (i >= first_rtl)
@@ -585,6 +649,7 @@ print_node (file, prefix, node, indent)
 		    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;
 
     case 'c':
@@ -659,7 +724,7 @@ print_node (file, prefix, node, indent)
 	  break;
 
 	case IDENTIFIER_NODE:
-	  print_lang_identifier (file, node, indent);
+	  (*lang_hooks.print_identifier) (file, node, indent);
 	  break;
 
 	case TREE_LIST:
@@ -680,14 +745,9 @@ print_node (file, prefix, node, indent)
 	      }
 	  break;
 
-	case OP_IDENTIFIER:
-	  print_node (file, "op1", TREE_PURPOSE (node), indent + 4);
-	  print_node (file, "op2", TREE_VALUE (node), indent + 4);
-	  break;
-
 	default:
 	  if (TREE_CODE_CLASS (TREE_CODE (node)) == 'x')
-	    lang_print_xnode (file, node, indent);
+	    (*lang_hooks.print_xnode) (file, node, indent);
 	  break;
 	}