Makefile.in (C_AND_OBJC_OBJS): Add c-dump.o.

	* Makefile.in (C_AND_OBJC_OBJS): Add c-dump.o.
	(c-dump.o): New target.
	* c-common.h (flag_dump_translation_unit): New variable.
	(C_TYPE_QUALS): New macro.
	(strip_array_types): New function.
	(DECL_C_BIT_FIELD): New macro.
	(SET_DECL_C_BIT_FIELD): Likewise.
	(CLEAR_DECL_C_BIT_FIELD): Likewise.
	(dump_info_p): New typedef.
	(dump_tree_fn): Likewise.
	(lang_dump_tree): New variable.
	(dump_node_to_file): New function.
	* c-common.c (flag_dump_translation_unit): Define it.
	(strip_array_types): New function.
	* c-decl.c (c_decode_option): Handle -fdump-translation-unit.
	* c-lang.c (finish_file): Call dump_node_to_file if
	flag_dump_translation_unit.
	* c-semantics.c (mark_rtl_for_local_static): Fix typo in comment.
	* c-tree.h (DECL_C_BIT_FIELD): Remove declaration.
	* c-dump.c: New file.

	* Make-lang.in (CXX_C_OBJS): Add c-dump.o.
	(dump.o): Update dependency list.
	* cp-tree.h (DECL_MAYBE_TEMPLATE): Remove.
	(flag_dump_translation_unit): Likewise.
	(CP_TYPE_QUALS): Adjust definition.
	(DECL_C_BIT_FIELD): Remove.
	(SET_DECL_C_BIT_FIELD): Likewise.
	(CLEAR_DECL_C_BIT_FIELD): Likewise.
	(add_maybe_template): Likewise.
	(strip_array_types): Likewise.
	(dump_node_to_file): Likewise.
	(cp_dump_tree): New function.
	* decl.c (init_decl_processing): Set lang_dump_tree.
	* decl2.c (flag_dump_translation_unit): Remove.
	* dump.c: Move most of it to ../c-dump.c.
	(cp_dump_tree): New function.
	* pt.c (add_maybe_template): Remove.
	* typeck.c (strip_array_types): Likewise.

From-SVN: r37358

gcc/ChangeLog

+2000-11-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* Makefile.in (C_AND_OBJC_OBJS): Add c-dump.o.
+	(c-dump.o): New target.
+	* c-common.h (flag_dump_translation_unit): New variable.
+	(C_TYPE_QUALS): New macro.
+	(strip_array_types): New function.
+	(DECL_C_BIT_FIELD): New macro.
+	(SET_DECL_C_BIT_FIELD): Likewise.
+	(CLEAR_DECL_C_BIT_FIELD): Likewise.
+	(dump_info_p): New typedef.
+	(dump_tree_fn): Likewise.
+	(lang_dump_tree): New variable.
+	(dump_node_to_file): New function.
+	* c-common.c (flag_dump_translation_unit): Define it.
+	(strip_array_types): New function.
+	* c-decl.c (c_decode_option): Handle -fdump-translation-unit.
+	* c-lang.c (finish_file): Call dump_node_to_file if 
+	flag_dump_translation_unit.
+	* c-semantics.c (mark_rtl_for_local_static): Fix typo in comment.
+	* c-tree.h (DECL_C_BIT_FIELD): Remove declaration.
+	* c-dump.c: New file.
+	
 2000-11-09  Christopher Faylor <cgf@cygnus.com>
 
 	* config/i386/cygwin.h: Add mingw startfile prefix.

gcc/Makefile.in

@@ -723,7 +723,7 @@ SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \
 
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
-  c-convert.o c-aux-info.o c-common.o c-semantics.o $(MAYBE_CPPLIB)
+  c-convert.o c-aux-info.o c-common.o c-semantics.o c-dump.o $(MAYBE_CPPLIB)
 
 # Language-specific object files for C.
 C_OBJS = c-parse.o c-lang.o $(C_AND_OBJC_OBJS)
@@ -1224,6 +1224,10 @@ c-semantics.o : c-semantics.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) \
 	c-lex.h flags.h toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \
 	$(EXPR_H)
 
+c-dump.o: c-dump.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) \
+	c-lex.h flags.h toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \
+	$(EXPR_H) $(SPLAY_TREE_H) c-dump.h
+
 # Language-independent files.
 
 DRIVER_DEFINES = \

gcc/c-common.c

@@ -149,6 +149,11 @@ int flag_no_builtin;
 
 int flag_no_nonansi_builtin;
 
+/* If non-NULL, dump the tree structure for the entire translation
+   unit to this file.  */
+
+const char *flag_dump_translation_unit;
+
 /* Nonzero means warn about possible violations of sequence point rules.  */
 
 int warn_sequence_point;
@@ -5398,6 +5403,19 @@ self_promoting_args_p (parms)
   return 1;
 }
 
+/* Recursively examines the array elements of TYPE, until a non-array
+   element type is found.  */
+
+tree
+strip_array_types (type)
+     tree type;
+{
+  while (TREE_CODE (type) == ARRAY_TYPE)
+    type = TREE_TYPE (type);
+
+  return type;
+}
+
 /* Recognize certain built-in functions so we can make tree-codes
    other than CALL_EXPR.  We do this when it enables fold-const.c
    to do something useful.  */

gcc/c-common.h

@@ -379,6 +379,11 @@ extern int flag_no_builtin;
 
 extern int flag_no_nonansi_builtin;
 
+/* If non-NULL, dump the tree structure for the entire translation
+   unit to this file.  */
+
+extern const char *flag_dump_translation_unit;
+
 /* Nonzero means warn about suggesting putting in ()'s.  */
 
 extern int warn_parentheses;
@@ -398,6 +403,14 @@ extern int warn_conversion;
 #define C_TYPE_FUNCTION_P(type) \
   (TREE_CODE (type) == FUNCTION_TYPE)
 
+/* Return the qualifiers that apply to this type.  In C++, that means
+   descending through array types.  Note that this macro evaluates its
+   arguments mor than once.  */
+#define C_TYPE_QUALS(TYPE)				\
+  (TYPE_QUALS ((TREE_CODE (TYPE) == ARRAY_TYPE 		\
+		&& c_language == clk_cplusplus)		\
+	       ? strip_array_types (TYPE) : TYPE))
+
 /* For convenience we define a single macro to identify the class of
    object or incomplete types.  */
 #define C_TYPE_OBJECT_OR_INCOMPLETE_P(type) \
@@ -480,6 +493,7 @@ extern tree build_va_arg			PARAMS ((tree, tree));
 
 extern int self_promoting_args_p		PARAMS ((tree));
 extern tree simple_type_promotes_to		PARAMS ((tree));
+extern tree strip_array_types                   PARAMS ((tree));
 
 /* These macros provide convenient access to the various _STMT nodes.  */
 
@@ -657,6 +671,14 @@ extern int anon_aggr_type_p                     PARAMS ((tree));
    sub-variables that make up the anonymous union.  */
 #define DECL_ANON_UNION_ELEMS(NODE) DECL_ARGUMENTS ((NODE))
 
+/* In a FIELD_DECL, nonzero if the decl was originally a bitfield.  */
+#define DECL_C_BIT_FIELD(NODE) \
+  (DECL_LANG_FLAG_4 (FIELD_DECL_CHECK (NODE)) == 1)
+#define SET_DECL_C_BIT_FIELD(NODE) \
+  (DECL_LANG_FLAG_4 (FIELD_DECL_CHECK (NODE)) = 1)
+#define CLEAR_DECL_C_BIT_FIELD(NODE) \
+  (DECL_LANG_FLAG_4 (FIELD_DECL_CHECK (NODE)) = 0)
+
 extern void emit_local_var                      PARAMS ((tree));
 extern void make_rtl_for_local_static           PARAMS ((tree));
 extern tree expand_cond                         PARAMS ((tree));
@@ -722,6 +744,20 @@ extern int c_safe_from_p                        PARAMS ((rtx, tree));
 
 #endif
 
+/* In dump.c */
+
+typedef struct dump_info *dump_info_p;
+
+/* A callback function used dump language-specific parts of tree
+   nodes.  Returns non-zero if it does not want the usual dumping of
+   the second argument.  */
+
+typedef int (*dump_tree_fn) PARAMS ((dump_info_p, tree));
+
+extern dump_tree_fn lang_dump_tree;
+
+extern void dump_node_to_file                   PARAMS ((tree, const char *));
+
 /* Information recorded about each file examined during compilation.  */
 
 struct c_fileinfo

gcc/c-decl.c

@@ -510,6 +510,7 @@ c_decode_option (argc, argv)
      char **argv;
 {
   int strings_processed;
+  const char *option_value = NULL;
   char *p = argv[0];
 #if USE_CPPLIB
   strings_processed = cpp_handle_option (&parse_in, argc, argv);
@@ -667,6 +668,14 @@ c_decode_option (argc, argv)
     flag_no_builtin = 0;
   else if (!strcmp (p, "-fno-builtin"))
     flag_no_builtin = 1;
+  else if ((option_value
+	    = skip_leading_substring (p, "-fdump-translation-unit-")))
+    {
+      if (p[22] == '\0')
+	error ("no file specified with -fdump-translation-unit");
+      else
+	flag_dump_translation_unit = option_value;
+    }
   else if (!strcmp (p, "-ansi"))
     goto iso_1990;
   else if (!strcmp (p, "-Werror-implicit-function-declaration"))
@@ -5464,7 +5473,8 @@ finish_struct (t, fieldlist, attributes)
 				   "`%s' is narrower than values of its type");
 
 	      DECL_SIZE (x) = bitsize_int (width);
-	      DECL_BIT_FIELD (x) = DECL_C_BIT_FIELD (x) = 1;
+	      DECL_BIT_FIELD (x) = 1;
+	      SET_DECL_C_BIT_FIELD (x);
 
 	      if (width == 0)
 		{

gcc/c-lang.c

@@ -268,6 +268,9 @@ finish_file ()
   
   if (back_end_hook)
     (*back_end_hook) (getdecls ());
+
+  if (flag_dump_translation_unit)
+    dump_node_to_file (getdecls (), flag_dump_translation_unit);
 }
 
 /* Called during diagnostic message formatting process to print a

gcc/c-semantics.c

@@ -283,7 +283,7 @@ make_rtl_for_local_static (decl)
 
   /* If the DECL_ASSEMBLER_NAME is not the same as the DECL_NAME, then
      either we already created RTL for this DECL (and since it was a
-     local variable, its DECL_ASSMEMBLER_NAME got hacked up to prevent
+     local variable, its DECL_ASSEMBLER_NAME got hacked up to prevent
      clashes with other local statics with the same name by a previous
      call to make_decl_rtl), or the user explicitly requested a
      particular assembly name for this variable, using the GNU

gcc/c-tree.h

@@ -140,9 +140,6 @@ struct lang_type
    without prototypes.  */
 #define TYPE_ACTUAL_ARG_TYPES(NODE) TYPE_NONCOPIED_PARTS (NODE)
 
-/* In a FIELD_DECL, nonzero if the decl was originally a bitfield.  */
-#define DECL_C_BIT_FIELD(NODE) DECL_LANG_FLAG_4 (NODE)
-
 
 /* in c-lang.c and objc-act.c */
 extern tree lookup_interface			PARAMS ((tree));

gcc/cp/ChangeLog

+2000-11-09  Mark Mitchell  <mark@codesourcery.com>
+
+	* Make-lang.in (CXX_C_OBJS): Add c-dump.o.
+	(dump.o): Update dependency list.
+	* cp-tree.h (DECL_MAYBE_TEMPLATE): Remove.
+	(flag_dump_translation_unit): Likewise.
+	(CP_TYPE_QUALS): Adjust definition.
+	(DECL_C_BIT_FIELD): Remove.
+	(SET_DECL_C_BIT_FIELD): Likewise.
+	(CLEAR_DECL_C_BIT_FIELD): Likewise.
+	(add_maybe_template): Likewise.
+	(strip_array_types): Likewise.
+	(dump_node_to_file): Likewise.
+	(cp_dump_tree): New function.
+	* decl.c (init_decl_processing): Set lang_dump_tree.
+	* decl2.c (flag_dump_translation_unit): Remove.
+	* dump.c: Move most of it to ../c-dump.c.
+	(cp_dump_tree): New function.
+	* pt.c (add_maybe_template): Remove.
+	* typeck.c (strip_array_types): Likewise.
+	
 2000-11-07  Eric Christopher  <echristo@redhat.com>
 
         * decl.c (init_decl_processing): Change definition of

gcc/cp/Make-lang.in

@@ -90,7 +90,7 @@ $(DEMANGLER_PROG): cxxmain.o underscore.o $(LIBDEPS)
 
 # The compiler itself.
 # Shared with C front end:
-CXX_C_OBJS = c-common.o c-pragma.o c-semantics.o c-lex.o
+CXX_C_OBJS = c-common.o c-pragma.o c-semantics.o c-lex.o c-dump.o
 
 # Language-specific object files.
 CXX_OBJS = cp/call.o cp/decl.o cp/errfn.o cp/expr.o cp/pt.o cp/typeck2.o \
@@ -264,7 +264,7 @@ cp/errfn.o: cp/errfn.c $(CXX_TREE_H) toplev.h
 cp/repo.o: cp/repo.c $(CXX_TREE_H) toplev.h $(GGC_H)
 cp/semantics.o: cp/semantics.c $(CXX_TREE_H) cp/lex.h except.h toplev.h \
   flags.h $(GGC_H) output.h $(RTL_H) $(TIMEVAR_H)
-cp/dump.o: cp/dump.c $(CXX_TREE_H)
+cp/dump.o: cp/dump.c $(CXX_TREE_H) c-dump.h
 cp/optimize.o: cp/optimize.c $(CXX_TREE_H) rtl.h integrate.h insn-config.h \
   input.h
 cp/mangle.o: cp/mangle.c $(CXX_TREE_H) toplev.h

gcc/cp/cp-tree.h

@@ -95,7 +95,7 @@ Boston, MA 02111-1307, USA.  */
    2: DECL_THIS_EXTERN (in VAR_DECL or FUNCTION_DECL).
       DECL_IMPLICIT_TYPEDEF_P (in a TYPE_DECL)
    3: DECL_IN_AGGR_P.
-   4: DECL_MAYBE_TEMPLATE.
+   4: DECL_C_BIT_FIELD
    5: DECL_INTERFACE_KNOWN.
    6: DECL_THIS_STATIC (in VAR_DECL or FUNCTION_DECL).
    7: DECL_DEAD_FOR_LOCAL (in VAR_DECL).
@@ -1031,11 +1031,6 @@ extern int warn_ctor_dtor_privacy;
 
 extern int warn_return_type;
 
-/* If non-NULL, dump the tree structure for the entire translation
-   unit to this file.  */
-
-extern const char *flag_dump_translation_unit;
-
 /* Nonzero means warn about deprecated conversion from string constant to
    `char *'.  */
 
@@ -1237,9 +1232,7 @@ enum languages { lang_c, lang_cplusplus, lang_java };
 
 /* The type qualifiers for this type, including the qualifiers on the
    elements for an array type.  */
-#define CP_TYPE_QUALS(NODE)			\
-  ((TREE_CODE (NODE) != ARRAY_TYPE)		\
-   ? TYPE_QUALS (NODE) : cp_type_quals (NODE))
+#define CP_TYPE_QUALS(NODE) C_TYPE_QUALS (NODE)
 
 /* Nonzero if this type is const-qualified.  */
 #define CP_TYPE_CONST_P(NODE)				\
@@ -2486,14 +2479,6 @@ extern int flag_new_for_scope;
 /* Record whether a typedef for type `int' was actually `signed int'.  */
 #define C_TYPEDEF_EXPLICITLY_SIGNED(exp) DECL_LANG_FLAG_1 ((exp))
 
-/* In a FIELD_DECL, nonzero if the decl was originally a bitfield.  */
-#define DECL_C_BIT_FIELD(NODE) \
-  (DECL_LANG_FLAG_1 (FIELD_DECL_CHECK (NODE)) == 1)
-#define SET_DECL_C_BIT_FIELD(NODE) \
-  (DECL_LANG_FLAG_1 (FIELD_DECL_CHECK (NODE)) = 1)
-#define CLEAR_DECL_C_BIT_FIELD(NODE) \
-  (DECL_LANG_FLAG_1 (FIELD_DECL_CHECK (NODE)) = 0)
-
 /* In a FUNCTION_DECL, nonzero if the function cannot be inlined.  */
 #define DECL_UNINLINABLE(NODE) \
   (DECL_LANG_SPECIFIC (NODE)->decl_flags.uninlinable)
@@ -4213,7 +4198,6 @@ extern void do_decl_instantiation		PARAMS ((tree, tree, tree));
 extern void do_type_instantiation		PARAMS ((tree, tree, int));
 extern tree instantiate_decl			PARAMS ((tree, int));
 extern tree get_bindings			PARAMS ((tree, tree, tree));
-extern void add_maybe_template			PARAMS ((tree, tree));
 extern void pop_tinst_level			PARAMS ((void));
 extern int more_specialized_class		PARAMS ((tree, tree));
 extern int is_member_template                   PARAMS ((tree));
@@ -4546,7 +4530,6 @@ extern tree convert_for_initialization		PARAMS ((tree, tree, tree, int, const ch
 extern int comp_ptr_ttypes			PARAMS ((tree, tree));
 extern int ptr_reasonably_similar		PARAMS ((tree, tree));
 extern tree build_ptrmemfunc			PARAMS ((tree, tree, int));
-extern tree strip_array_types                   PARAMS ((tree));
 extern int cp_type_quals                        PARAMS ((tree));
 extern int cp_has_mutable_p                     PARAMS ((tree));
 extern int at_least_as_qualified_p              PARAMS ((tree, tree));
@@ -4600,9 +4583,6 @@ extern void GNU_xref_assign			PARAMS ((tree));
 extern void GNU_xref_hier			PARAMS ((tree, tree, int, int, int));
 extern void GNU_xref_member			PARAMS ((tree, tree));
 
-/* in dump.c */
-extern void dump_node_to_file                   PARAMS ((tree, const char *));
-
 /* in mangle.c */
 extern void init_mangle                         PARAMS ((void));
 extern tree mangle_decl                         PARAMS ((tree));
@@ -4617,6 +4597,9 @@ extern tree mangle_thunk                        PARAMS ((tree, tree, tree));
 extern tree mangle_conv_op_name_for_type        PARAMS ((tree));
 extern tree mangle_guard_variable               PARAMS ((tree));
 
+/* in dump.c */
+extern int cp_dump_tree                         PARAMS ((dump_info_p, tree));
+
 /* -- end of C++ */
 
 #endif /* not _CP_TREE_H */

gcc/cp/decl.c

@@ -6331,6 +6331,7 @@ init_decl_processing ()
   free_lang_status = &pop_cp_function_context;
   mark_lang_status = &mark_cp_function_context;
   lang_safe_from_p = &c_safe_from_p;
+  lang_dump_tree = &cp_dump_tree;
 
   cp_parse_init ();
   init_decl2 ();

gcc/cp/decl2.c

@@ -236,11 +236,6 @@ int flag_optional_diags = 1;
 
 int flag_const_strings = 1;
 
-/* If non-NULL, dump the tree structure for the entire translation
-   unit to this file.  */
-
-const char *flag_dump_translation_unit = 0;
-
 /* Nonzero means warn about deprecated conversion from string constant to
    `char *'.  */
 

gcc/cp/pt.c

@@ -5654,7 +5654,7 @@ tsubst_decl (t, args, type, in_decl)
 	/* We do NOT check for matching decls pushed separately at this
            point, as they may not represent instantiations of this
            template, and in any case are considered separate under the
-           discrete model.  Instead, see add_maybe_template.  */
+           discrete model.  */
 	r = copy_decl (t);
 	DECL_USE_TEMPLATE (r) = 0;
 	TREE_TYPE (r) = type;
@@ -9871,34 +9871,6 @@ tsubst_initializer_list (t, argvec)
   return first;
 }
 
-/* D is an undefined function declaration in the presence of templates with
-   the same name, listed in FNS.  If one of them can produce D as an
-   instantiation, remember this so we can instantiate it at EOF if D has
-   not been defined by that time.  */
-
-void
-add_maybe_template (d, fns)
-     tree d, fns;
-{
-  tree t;
-
-  if (DECL_MAYBE_TEMPLATE (d))
-    return;
-
-  t = most_specialized (fns, d, NULL_TREE);
-  if (! t)
-    return;
-  if (t == error_mark_node)
-    {
-      cp_error ("ambiguous template instantiation for `%D'", d);
-      return;
-    }
-
-  *maybe_template_tail = tree_cons (t, d, NULL_TREE);
-  maybe_template_tail = &TREE_CHAIN (*maybe_template_tail);
-  DECL_MAYBE_TEMPLATE (d) = 1;
-}
-
 /* Set CURRENT_ACCESS_SPECIFIER based on the protection of DECL.  */
 
 static void

gcc/cp/typeck.c

@@ -6967,19 +6967,6 @@ comp_ptr_ttypes_reinterpret (to, from)
     }
 }
 
-/* Recursively examines the array elements of TYPE, until a non-array
-   element type is found.  */
-
-tree
-strip_array_types (type)
-     tree type;
-{
-  while (TREE_CODE (type) == ARRAY_TYPE)
-    type = TREE_TYPE (type);
-
-  return type;
-}
-
 /* Returns the type-qualifier set corresponding to TYPE.  */
 
 int