This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[gcc-in-cxx] PATCH COMMITTED: Combine all tree codes into one enum
- From: Ian Lance Taylor <iant at google dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 19 Jun 2008 12:20:12 -0700
- Subject: [gcc-in-cxx] PATCH COMMITTED: Combine all tree codes into one enum
One hassle with compiling gcc in C++ is that we casually mix enum
types in the frontends. This was originally done because the code
field in the tree type was eight bits, and there was not enough room
to hold all the different tree codes used by all the frontends.
However, the code field is now 16 bits, and there is no longer any
reason for the awkward tree code split.
I have committed this patch to the gcc-in-cxx branch to generate a
single set of tree codes across all the frontends. I am testing this
patch for mainline.
Ian
2008-06-19 Ian Lance Taylor <iant@google.com>
* tree.h (enum tree_code): Include all-tree.def, not tree.def.
* tree.c (tree_code_type): New global array.
(tree_code_length, tree_code_name): Likewise.
* Makefile.in (TREE_H): Add all-tree.def, c-common.def, and
$(lang_tree_files).
(all-tree.def, s-alltree): New targets.
(gencheck.h, s-gencheck): Remove.
(tree.o): Depend upon all-tree.def.
(build/gencheck.o): Remove gencheck.h dependency.
(mostlyclean): Don't remove gencheck.h.
* c-common.h (enum c_tree_code): Remove.
* c-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* gencheck.c (tree_codes): Include all-tree.def, rather than
tree.def, c-common.def, and gencheck.h. Undefined DEFTREECODE
after it is used.
* tree-browser.c (tb_tree_codes): Include all-tree.def, rather
than tree.def.
* cp/cp-tree.h (enum cplus_tree_code): Remove.
(operator_name_info): Size to LAST_AND_UNUSED_TREE_CODE.
(assignment_operator_name_info): Likewise.
* cp/cp-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* cp/lex.c (operator_name_info): Size to
LAST_AND_UNUSED_TREE_CODE.
(assignment_operator_name_info): Likewise.
* cp/decl.c (grok_op_properties): Change LAST_CPLUS_TREE_CODE to
LAST_AND_UNUSED_TREE_CODE.
* cp/mangle.c (write_expression): Likewise.
* cp/Make-lang.in (CXX_TREE_H): Remove cp/cp-tree.def.
* fortran/f95-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* java/java-tree.h (enum java_tree_code): Remove.
* java/lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* java/Make-lang.in (JAVA_TREE_H): Remove java/java-tree.def.
* objc/objc-act.h (enum objc_tree_code): Remove.
* objc/objc-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* objcp/objcp-lang.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
* ada/ada-tre.h (enum gnat_tree_code): Remove.
* ada/Make-lang.in (ADA_TREE_H): Remove ada/ada-tre.def.
* ada/misc.c (tree_code_type): Remove.
(tree_code_length, tree_code_name): Remove.
Index: gencheck.c
===================================================================
--- gencheck.c (revision 136884)
+++ gencheck.c (working copy)
@@ -26,12 +26,12 @@ along with GCC; see the file COPYING3.
#define DEFTREECODE(SYM, NAME, TYPE, LEN) #SYM,
static const char *const tree_codes[] = {
-#include "tree.def"
-#include "c-common.def"
-#include "gencheck.h"
+#include "all-tree.def"
(char*) 0
};
+#undef DEFTREECODE
+
static void usage (void);
static void
Index: java/Make-lang.in
===================================================================
--- java/Make-lang.in (revision 136884)
+++ java/Make-lang.in (working copy)
@@ -242,7 +242,7 @@ java.stagefeedback: stageprofile-start
#
# .o:.h dependencies.
-JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def
+JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h
java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \
Index: java/lang.c
===================================================================
--- java/lang.c (revision 136884)
+++ java/lang.c (working copy)
@@ -69,43 +69,6 @@ static enum classify_record java_classif
# define TARGET_OBJECT_SUFFIX ".o"
#endif
-/* Table indexed by tree code giving a string containing a character
- classifying the tree code. Possibilities are
- t, d, s, c, r, <, 1 and 2. See java/java-tree.def for details. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "java-tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "java-tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "java-tree.def"
-};
-#undef DEFTREECODE
-
/* Table of machine-independent attributes. */
const struct attribute_spec java_attribute_table[] =
{
Index: java/java-tree.h
===================================================================
--- java/java-tree.h (revision 136884)
+++ java/java-tree.h (working copy)
@@ -30,15 +30,6 @@ The Free Software Foundation is independ
#include "hashtab.h"
-/* Java language-specific tree codes. */
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM,
-enum java_tree_code {
- __DUMMY = LAST_AND_UNUSED_TREE_CODE,
-#include "java-tree.def"
- LAST_JAVA_TREE_CODE
-};
-#undef DEFTREECODE
-
struct JCF;
/* Usage of TREE_LANG_FLAG_?:
Index: tree.c
===================================================================
--- tree.c (revision 136884)
+++ tree.c (working copy)
@@ -52,6 +52,38 @@ along with GCC; see the file COPYING3.
#include "pointer-set.h"
#include "fixed-value.h"
+/* Tree code classes. */
+
+#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
+
+const enum tree_code_class tree_code_type[] = {
+#include "all-tree.def"
+};
+
+#undef DEFTREECODE
+
+/* Table indexed by tree code giving number of expression
+ operands beyond the fixed part of the node structure.
+ Not used for types or decls. */
+
+#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
+
+const unsigned char tree_code_length[] = {
+#include "all-tree.def"
+};
+
+#undef DEFTREECODE
+
+/* Names of tree components.
+ Used for printing out the tree and error messages. */
+#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
+
+const char *const tree_code_name[] = {
+#include "all-tree.def"
+};
+
+#undef DEFTREECODE
+
/* Each tree code class has an associated string representation.
These must correspond to the tree_code_class entries. */
Index: tree.h
===================================================================
--- tree.h (revision 136884)
+++ tree.h (working copy)
@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.
#define DEFTREECODE(SYM, STRING, TYPE, NARGS) SYM,
enum tree_code {
-#include "tree.def"
+#include "all-tree.def"
LAST_AND_UNUSED_TREE_CODE /* A convenient way to get a value for
NUM_TREE_CODES. */
Index: objc/objc-act.h
===================================================================
--- objc/objc-act.h (revision 136884)
+++ objc/objc-act.h (working copy)
@@ -122,24 +122,6 @@ enum gimplify_status objc_gimplify_expr
#define OBJC_TYPE_NAME(TYPE) TYPE_NAME(TYPE)
#define OBJC_SET_TYPE_NAME(TYPE, NAME) (TYPE_NAME (TYPE) = NAME)
-/* Define the Objective-C or Objective-C++ language-specific tree codes. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM,
-enum objc_tree_code {
-#if defined (GCC_CP_TREE_H)
- LAST_BASE_TREE_CODE = LAST_CPLUS_TREE_CODE,
-#else
-#if defined (GCC_C_TREE_H)
- LAST_BASE_TREE_CODE = LAST_C_TREE_CODE,
-#else
- #error You must include <c-tree.h> or <cp/cp-tree.h> before <objc/objc-act.h>
-#endif
-#endif
-#include "objc-tree.def"
- LAST_OBJC_TREE_CODE
-};
-#undef DEFTREECODE
-
/* Hash tables to manage the global pool of method prototypes. */
typedef struct hashed_entry *hash;
Index: objc/objc-lang.c
===================================================================
--- objc/objc-lang.c (revision 136884)
+++ objc/objc-lang.c (working copy)
@@ -56,48 +56,6 @@ static void objc_init_ts (void);
/* Each front end provides its own lang hook initializer. */
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Table indexed by tree code giving a string containing a character
- classifying the tree code. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "c-common.def"
- tcc_exceptional,
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "c-common.def"
- 0,
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char * const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "c-common.def"
- "@@dummy",
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
/* Lang hook routines common to C and ObjC appear in c-objc-common.c;
there should be very few (if any) routines below. */
Index: objcp/objcp-lang.c
===================================================================
--- objcp/objcp-lang.c (revision 136884)
+++ objcp/objcp-lang.c (working copy)
@@ -56,53 +56,6 @@ static void objcxx_init_ts (void);
/* Each front end provides its own lang hook initializer. */
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Tree code classes. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "c-common.def"
- tcc_exceptional,
-#include "cp-tree.def"
- tcc_exceptional,
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "c-common.def"
- 0,
-#include "cp-tree.def"
- 0,
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "c-common.def"
- "@@dummy",
-#include "cp-tree.def"
- "@@dummy",
-#include "objc-tree.def"
-};
-#undef DEFTREECODE
-
/* Lang hook routines common to C++ and ObjC++ appear in cp/cp-objcp-common.c;
there should be very few (if any) routines below. */
Index: cp/decl.c
===================================================================
--- cp/decl.c (revision 136884)
+++ cp/decl.c (working copy)
@@ -9771,7 +9771,7 @@ grok_op_properties (tree decl, bool comp
gcc_unreachable ();
}
while (0);
- gcc_assert (operator_code != LAST_CPLUS_TREE_CODE);
+ gcc_assert (operator_code != LAST_AND_UNUSED_TREE_CODE);
SET_OVERLOADED_OPERATOR_CODE (decl, operator_code);
if (class_type)
Index: cp/Make-lang.in
===================================================================
--- cp/Make-lang.in (revision 136884)
+++ cp/Make-lang.in (working copy)
@@ -222,7 +222,7 @@ c++.stagefeedback: stagefeedback-start
#
# .o: .h dependencies.
CXX_TREE_H = $(TREE_H) cp/name-lookup.h cp/cp-tree.h $(C_COMMON_H) \
- cp/cp-tree.def c-common.def $(FUNCTION_H) $(VARRAY_H) \
+ c-common.def $(FUNCTION_H) $(VARRAY_H) \
$(SYSTEM_H) coretypes.h $(CONFIG_H) $(TARGET_H) $(GGC_H) \
$(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h
Index: cp/mangle.c
===================================================================
--- cp/mangle.c (revision 136884)
+++ cp/mangle.c (working copy)
@@ -2108,7 +2108,7 @@ write_expression (tree expr)
/* Unfortunately, there is no easy way to go from the
name of the operator back to the corresponding tree
code. */
- for (i = 0; i < LAST_CPLUS_TREE_CODE; ++i)
+ for (i = 0; i < LAST_AND_UNUSED_TREE_CODE; ++i)
if (operator_name_info[i].identifier == member)
{
/* The ABI says that we prefer binary operator
Index: cp/cp-tree.h
===================================================================
--- cp/cp-tree.h (revision 136884)
+++ cp/cp-tree.h (working copy)
@@ -926,15 +926,6 @@ struct language_function GTY(())
((NODE) == error_mark_node \
|| ((NODE) && TREE_TYPE ((NODE)) == error_mark_node))
-/* C++ language-specific tree codes. */
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM,
-enum cplus_tree_code {
- CP_DUMMY_TREE_CODE = LAST_C_TREE_CODE,
-#include "cp-tree.def"
- LAST_CPLUS_TREE_CODE
-};
-#undef DEFTREECODE
-
/* TRUE if a tree code represents a statement. */
extern bool statement_code_p[MAX_TREE_CODES];
@@ -3865,10 +3856,10 @@ typedef struct operator_name_info_t GTY(
/* A mapping from tree codes to operator name information. */
extern GTY(()) operator_name_info_t operator_name_info
- [(int) LAST_CPLUS_TREE_CODE];
+ [(int) LAST_AND_UNUSED_TREE_CODE];
/* Similar, but for assignment operators. */
extern GTY(()) operator_name_info_t assignment_operator_name_info
- [(int) LAST_CPLUS_TREE_CODE];
+ [(int) LAST_AND_UNUSED_TREE_CODE];
/* A type-qualifier, or bitmask therefore, using the TYPE_QUAL
constants. */
Index: cp/cp-lang.c
===================================================================
--- cp/cp-lang.c (revision 136884)
+++ cp/cp-lang.c (working copy)
@@ -61,47 +61,6 @@ static enum classify_record cp_classify_
/* Each front end provides its own lang hook initializer. */
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Tree code classes. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "c-common.def"
- tcc_exceptional,
-#include "cp-tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "c-common.def"
- 0,
-#include "cp-tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "c-common.def"
- "@@dummy",
-#include "cp-tree.def"
-};
-#undef DEFTREECODE
-
/* Lang hook routines common to C++ and ObjC++ appear in cp/cp-objcp-common.c;
there should be very few routines below. */
Index: cp/lex.c
===================================================================
--- cp/lex.c (revision 136884)
+++ cp/lex.c (working copy)
@@ -89,9 +89,10 @@ cxx_finish (void)
}
/* A mapping from tree codes to operator name information. */
-operator_name_info_t operator_name_info[(int) LAST_CPLUS_TREE_CODE];
+operator_name_info_t operator_name_info[(int) LAST_AND_UNUSED_TREE_CODE];
/* Similar, but for assignment operators. */
-operator_name_info_t assignment_operator_name_info[(int) LAST_CPLUS_TREE_CODE];
+operator_name_info_t
+assignment_operator_name_info[(int) LAST_AND_UNUSED_TREE_CODE];
/* Initialize data structures that keep track of operator names. */
Index: tree-browser.c
===================================================================
--- tree-browser.c (revision 136884)
+++ tree-browser.c (working copy)
@@ -73,7 +73,7 @@ struct tb_tree_code {
#define DEFTREECODE(SYM, STRING, TYPE, NARGS) { SYM, STRING, sizeof (STRING) - 1 },
static const struct tb_tree_code tb_tree_codes[] =
{
-#include "tree.def"
+#include "all-tree.def"
};
#undef DEFTREECODE
Index: ada/Make-lang.in
===================================================================
--- ada/Make-lang.in (revision 136884)
+++ ada/Make-lang.in (working copy)
@@ -980,7 +980,7 @@ ada/sdefault.o : ada/ada.ads ada/a-excep
ada/s-wchcon.ads ada/system.ads ada/table.adb ada/table.ads ada/tree_io.ads \
ada/types.ads ada/unchdeal.ads ada/unchconv.ads
-ADA_TREE_H = ada/ada-tree.h ada/ada-tree.def
+ADA_TREE_H = ada/ada-tree.h
# force debugging information on s-tasdeb.o so that it is always
# possible to set conditional breakpoints on tasks.
Index: ada/ada-tree.h
===================================================================
--- ada/ada-tree.h (revision 136884)
+++ ada/ada-tree.h (working copy)
@@ -23,15 +23,6 @@
* *
****************************************************************************/
-/* Ada language-specific GC tree codes. */
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM,
-enum gnat_tree_code {
- __DUMMY = LAST_AND_UNUSED_TREE_CODE,
-#include "ada-tree.def"
- LAST_GNAT_TREE_CODE
-};
-#undef DEFTREECODE
-
/* Ada uses the lang_decl and lang_type fields to hold a tree. */
union lang_tree_node
GTY((desc ("0"),
Index: ada/misc.c
===================================================================
--- ada/misc.c (revision 136884)
+++ ada/misc.c (working copy)
@@ -160,45 +160,6 @@ static tree gnat_type_max_size (const_t
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Tables describing GCC tree codes used only by GNAT.
-
- Table indexed by tree code giving a string containing a character
- classifying the tree code. Possibilities are
- t, d, s, c, r, <, 1 and 2. See cp-tree.def for details. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "ada-tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "ada-tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "ada-tree.def"
-};
-#undef DEFTREECODE
-
/* How much we want of our DWARF extensions. Some of our dwarf+ extensions
are incompatible with regular GDB versions, so we must make sure to only
produce them on explicit request. This is eventually reflected into the
Index: fortran/f95-lang.c
===================================================================
--- fortran/f95-lang.c (revision 136884)
+++ fortran/f95-lang.c (working copy)
@@ -154,40 +154,6 @@ static alias_set_type gfc_get_alias_set
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* A list (chain of TREE_LIST nodes) of all LABEL_DECLs in the function
- that have names. Here so we can clear out their names' definitions
- at the end of the function. */
-
-/* Tree code classes. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
-};
-#undef DEFTREECODE
-
-
#define NULL_BINDING_LEVEL (struct binding_level *) NULL
/* A chain of binding_level structures awaiting reuse. */
Index: c-common.h
===================================================================
--- c-common.h (revision 136946)
+++ c-common.h (working copy)
@@ -766,16 +766,6 @@ extern void finish_file (void);
#define COMPOUND_LITERAL_EXPR_DECL(NODE) \
DECL_EXPR_DECL (COMPOUND_LITERAL_EXPR_DECL_STMT (NODE))
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) SYM,
-
-enum c_tree_code {
- C_DUMMY_TREE_CODE = LAST_AND_UNUSED_TREE_CODE,
-#include "c-common.def"
- LAST_C_TREE_CODE
-};
-
-#undef DEFTREECODE
-
extern int anon_aggr_type_p (const_tree);
/* For a VAR_DECL that is an anonymous union, these are the various
Index: Makefile.in
===================================================================
--- Makefile.in (revision 136937)
+++ Makefile.in (working copy)
@@ -779,7 +779,8 @@ RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H)
RTL_H = $(RTL_BASE_H) genrtl.h
PARAMS_H = params.h params.def
BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def
-TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
+TREE_H = tree.h all-tree.def tree.def c-common.def $(lang_tree_files) \
+ $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \
input.h statistics.h vec.h treestruct.def $(HASHTAB_H) \
double-int.h alias.h
BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h $(PARTITION_H) \
@@ -1389,6 +1390,18 @@ ifneq ($(xmake_file),)
include $(xmake_file)
endif
+# all-tree.def includes all the tree.def files.
+all-tree.def: s-alltree; @true
+s-alltree: Makefile
+ rm -f tmp-all-tree.def
+ echo '#include "tree.def"' > tmp-all-tree.def
+ echo '#include "c-common.def"' >> tmp-all-tree.def
+ ltf="$(lang_tree_files)"; for f in $$ltf; do \
+ echo "#include \"$$f\""; \
+ done | sed 's|$(srcdir)/||' >> tmp-all-tree.def
+ $(SHELL) $(srcdir)/../move-if-change tmp-all-tree.def all-tree.def
+ $(STAMP) s-alltree
+
#
# -----------------------------
@@ -1908,14 +1921,6 @@ gccspec.o: gccspec.c $(CONFIG_H) $(SYSTE
cppspec.o: cppspec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
-gencheck.h : s-gencheck ; @true
-s-gencheck : Makefile
- ltf="$(lang_tree_files)"; for f in $$ltf; do \
- echo "#include \"$$f\""; \
- done | sed 's|$(srcdir)/||' > tmp-gencheck.h
- $(SHELL) $(srcdir)/../move-if-change tmp-gencheck.h gencheck.h
- $(STAMP) s-gencheck
-
specs.h : s-specs ; @true
s-specs : Makefile
lsf="$(lang_specs_files)"; for f in $$lsf; do \
@@ -1997,7 +2002,7 @@ langhooks.o : langhooks.c $(CONFIG_H) $(
langhooks.h $(LANGHOOKS_DEF_H) $(FLAGS_H) $(GGC_H) $(DIAGNOSTIC_H) intl.h \
$(TREE_GIMPLE_H)
tree.o : tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
- $(FLAGS_H) $(FUNCTION_H) $(PARAMS_H) \
+ all-tree.def $(FLAGS_H) $(FUNCTION_H) $(PARAMS_H) \
toplev.h $(GGC_H) $(HASHTAB_H) $(TARGET_H) output.h $(TM_P_H) langhooks.h \
$(REAL_H) gt-tree.h tree-iterator.h $(BASIC_BLOCK_H) $(TREE_FLOW_H) \
$(OBSTACK_H) pointer-set.h fixed-value.h
@@ -3252,7 +3257,7 @@ build/genattrtab.o : genattrtab.c $(RTL_
build/genautomata.o : genautomata.c $(RTL_BASE_H) $(OBSTACK_H) \
$(BCONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h vec.h \
$(HASHTAB_H) gensupport.h
-build/gencheck.o : gencheck.c gencheck.h tree.def $(BCONFIG_H) $(GTM_H) \
+build/gencheck.o : gencheck.c tree.def $(BCONFIG_H) $(GTM_H) \
$(SYSTEM_H) coretypes.h $(lang_tree_files)
build/genchecksum.o : genchecksum.c $(BCONFIG_H) $(SYSTEM_H) $(MD5_H)
build/gencodes.o : gencodes.c $(RTL_BASE_H) $(BCONFIG_H) $(SYSTEM_H) \
@@ -3876,7 +3881,7 @@ mostlyclean: lang.mostlyclean
-rm -f mddeps.mk
# Delete other built files.
-rm -f xsys-protos.hT
- -rm -f specs.h gencheck.h options.c options.h
+ -rm -f specs.h options.c options.h
# Delete the stamp and temporary files.
-rm -f s-* tmp-* stamp-* stmp-*
-rm -f */stamp-* */tmp-*
Index: c-lang.c
===================================================================
--- c-lang.c (revision 136884)
+++ c-lang.c (working copy)
@@ -47,41 +47,6 @@ enum c_language_kind c_language = clk_c;
/* Each front end provides its own lang hook initializer. */
const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER;
-/* Tree code classes. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE,
-
-const enum tree_code_class tree_code_type[] = {
-#include "tree.def"
- tcc_exceptional,
-#include "c-common.def"
-};
-#undef DEFTREECODE
-
-/* Table indexed by tree code giving number of expression
- operands beyond the fixed part of the node structure.
- Not used for types or decls. */
-
-#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH,
-
-const unsigned char tree_code_length[] = {
-#include "tree.def"
- 0,
-#include "c-common.def"
-};
-#undef DEFTREECODE
-
-/* Names of tree components.
- Used for printing out the tree and error messages. */
-#define DEFTREECODE(SYM, NAME, TYPE, LEN) NAME,
-
-const char *const tree_code_name[] = {
-#include "tree.def"
- "@@dummy",
-#include "c-common.def"
-};
-#undef DEFTREECODE
-
/* Final processing of file-scope data. The Objective-C version of
this function still does something. */
void