aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree.c3
-rw-r--r--gcc/tree.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ba41000..a0b099f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-03 Nathan Froyd <froydnj@codesourcery.com>
+
+ * tree.h (struct tree_const_decl): Inherit from tree_decl_common.
+ * tree.c (initialize_tree_contains_struct): Adjust accordingly.
+
2011-04-03 Anatoly Sokolov <aesok@post.ru>
* config/avr/avr.h (ASM_OUTPUT_BSS): Remove.
diff --git a/gcc/tree.c b/gcc/tree.c
index f1ac7a6..ee47982 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -439,6 +439,7 @@ initialize_tree_contains_struct (void)
break;
case TS_DECL_WRTL:
+ case TS_CONST_DECL:
MARK_TS_DECL_COMMON (code);
break;
@@ -450,7 +451,6 @@ initialize_tree_contains_struct (void)
case TS_PARM_DECL:
case TS_LABEL_DECL:
case TS_RESULT_DECL:
- case TS_CONST_DECL:
MARK_TS_DECL_WRTL (code);
break;
@@ -488,7 +488,6 @@ initialize_tree_contains_struct (void)
gcc_assert (tree_contains_struct[TRANSLATION_UNIT_DECL][TS_DECL_COMMON]);
gcc_assert (tree_contains_struct[LABEL_DECL][TS_DECL_COMMON]);
gcc_assert (tree_contains_struct[FIELD_DECL][TS_DECL_COMMON]);
- gcc_assert (tree_contains_struct[CONST_DECL][TS_DECL_WRTL]);
gcc_assert (tree_contains_struct[VAR_DECL][TS_DECL_WRTL]);
gcc_assert (tree_contains_struct[PARM_DECL][TS_DECL_WRTL]);
gcc_assert (tree_contains_struct[RESULT_DECL][TS_DECL_WRTL]);
diff --git a/gcc/tree.h b/gcc/tree.h
index 053076f..fcdebd9 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2963,7 +2963,7 @@ struct GTY(()) tree_result_decl {
};
struct GTY(()) tree_const_decl {
- struct tree_decl_with_rtl common;
+ struct tree_decl_common common;
};
/* For a PARM_DECL, records the data type used to pass the argument,