* tree.h (struct tree_int_cst, struct real_value): Include tree_typed

	instead of tree_common.
	(struct tree_fixed_cst, struct tree_string, struct tree_complex):
	Likewise.
	* tree.c (initialize_tree_contains_struct): Mark such nodes as being
	TS_TYPED rather than TS_COMMON.
	* print-tree.c (print_node) [STRING_CST]: Don't print TREE_CHAIN.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172386 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index feeed9b..c8522ec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-13  Nathan Froyd  <froydnj@codesourcery.com>
+
+       * tree.h (struct tree_int_cst, struct real_value): Include tree_typed
+       instead of tree_common.
+       (struct tree_fixed_cst, struct tree_string, struct tree_complex):
+       Likewise.
+       * tree.c (initialize_tree_contains_struct): Mark such nodes as being
+       TS_TYPED rather than TS_COMMON.
+       * print-tree.c (print_node) [STRING_CST]: Don't print TREE_CHAIN.
+
 2011-04-01  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/45263

diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index b0c6899..3b5edeb 100644 (file)
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -853,11 +853,6 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
              }
            fputc ('\"', file);
          }
-         /* Print the chain at second level.  */
-         if (indent == 4)
-           print_node (file, "chain", TREE_CHAIN (node), indent + 4);
-         else
-           print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
          break;
 
        case IDENTIFIER_NODE:

diff --git a/gcc/tree.c b/gcc/tree.c
index 9d9101d..c8e627f 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -371,15 +371,15 @@ initialize_tree_contains_struct (void)
          break;
 
        case TS_COMMON:
-         MARK_TS_TYPED (code);
-         break;
-
        case TS_INT_CST:
        case TS_REAL_CST:
        case TS_FIXED_CST:
        case TS_VECTOR:
        case TS_STRING:
        case TS_COMPLEX:
+         MARK_TS_TYPED (code);
+         break;
+
        case TS_IDENTIFIER:
        case TS_DECL_MINIMAL:
        case TS_TYPE:

diff --git a/gcc/tree.h b/gcc/tree.h
index 5d33185..b3ef62c 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1455,7 +1455,7 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int,
        && TREE_INT_CST_LOW (A) < TREE_INT_CST_LOW (B)))
 
 struct GTY(()) tree_int_cst {
-  struct tree_common common;
+  struct tree_typed typed;
   double_int int_cst;
 };
 
@@ -1468,7 +1468,7 @@ struct real_value;
 #define TREE_REAL_CST(NODE) (*TREE_REAL_CST_PTR (NODE))
 
 struct GTY(()) tree_real_cst {
-  struct tree_common common;
+  struct tree_typed typed;
   struct real_value * real_cst_ptr;
 };
 
@@ -1480,7 +1480,7 @@ struct fixed_value;
 #define TREE_FIXED_CST(NODE) (*TREE_FIXED_CST_PTR (NODE))
 
 struct GTY(()) tree_fixed_cst {
-  struct tree_common common;
+  struct tree_typed typed;
   struct fixed_value * fixed_cst_ptr;
 };
 
@@ -1490,7 +1490,7 @@ struct GTY(()) tree_fixed_cst {
   ((const char *)(STRING_CST_CHECK (NODE)->string.str))
 
 struct GTY(()) tree_string {
-  struct tree_common common;
+  struct tree_typed typed;
   int length;
   char str[1];
 };
@@ -1500,7 +1500,7 @@ struct GTY(()) tree_string {
 #define TREE_IMAGPART(NODE) (COMPLEX_CST_CHECK (NODE)->complex.imag)
 
 struct GTY(()) tree_complex {
-  struct tree_common common;
+  struct tree_typed typed;
   tree real;
   tree imag;
 };
@@ -1509,7 +1509,7 @@ struct GTY(()) tree_complex {
 #define TREE_VECTOR_CST_ELTS(NODE) (VECTOR_CST_CHECK (NODE)->vector.elements)
 
 struct GTY(()) tree_vector {
-  struct tree_common common;
+  struct tree_typed typed;
   tree elements;
 };
 \f