aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/c-decl.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr22308-1.c13
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d680ff8..2d38897 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-05 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/22308
+ * c-decl.c (finish_struct): Also copy C_TYPE_FIELDS_READONLY,
+ C_TYPE_FIELDS_VOLATILE and C_TYPE_VARIABLE_SIZE to type variants.
+
2005-07-05 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Adjust dependencies.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 3c241fe..23ff373 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -5420,6 +5420,9 @@ finish_struct (tree t, tree fieldlist, tree attributes)
TYPE_LANG_SPECIFIC (x) = TYPE_LANG_SPECIFIC (t);
TYPE_ALIGN (x) = TYPE_ALIGN (t);
TYPE_USER_ALIGN (x) = TYPE_USER_ALIGN (t);
+ C_TYPE_FIELDS_READONLY (x) = C_TYPE_FIELDS_READONLY (t);
+ C_TYPE_FIELDS_VOLATILE (x) = C_TYPE_FIELDS_VOLATILE (t);
+ C_TYPE_VARIABLE_SIZE (x) = C_TYPE_VARIABLE_SIZE (t);
}
/* If this was supposed to be a transparent union, but we can't
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 546754f..7588b666 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-05 Joseph S. Myers <joseph@codesourcery.com>
+
+ PR c/22308
+ * gcc.dg/pr22308-1.c: New test.
+
2005-07-05 Kazu Hirata <kazu@codesourcery.com>
* gcc.dg/compare1.c: Add -fno-short-enums. Don't skip on any
diff --git a/gcc/testsuite/gcc.dg/pr22308-1.c b/gcc/testsuite/gcc.dg/pr22308-1.c
new file mode 100644
index 0000000..bcbb294
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr22308-1.c
@@ -0,0 +1,13 @@
+/* Bug 22308: C_TYPE_FIELDS_READONLY not updated on type variants. */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+struct foo s;
+volatile struct foo t;
+struct foo { const int z; };
+
+void
+bar (void)
+{
+ t = s; /* { dg-error "error: assignment of read-only variable 't'" } */
+}