aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2013-08-16 14:59:02 +0000
committerDavid Malcolm <dmalcolm@gcc.gnu.org>2013-08-16 14:59:02 +0000
commit158f4e4f46cab61f09dfce1ff2ac7dbfec8bb615 (patch)
tree62f8775c6d656a1da39a1d608a81d4438c73ae04 /gcc
parent22f8cea5d84ae90721561a6c2fdeeb50e49ada87 (diff)
downloadgcc-158f4e4f46cab61f09dfce1ff2ac7dbfec8bb615.zip
gcc-158f4e4f46cab61f09dfce1ff2ac7dbfec8bb615.tar.gz
gcc-158f4e4f46cab61f09dfce1ff2ac7dbfec8bb615.tar.bz2
Fix bad interaction between GTY((user)) and incomplete declarations
gcc/ * gengtype.c (create_user_defined_type): Ensure that the kind is set to TYPE_USER_STRUCT, fixing a bug seen when an incomplete declaration is seen before the GTY((user)) marking. From-SVN: r201791
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gengtype.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cc51207..e71ae3e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-16 David Malcolm <dmalcolm@redhat.com>
+
+ * gengtype.c (create_user_defined_type): Ensure that the kind
+ is set to TYPE_USER_STRUCT, fixing a bug seen when an incomplete
+ declaration is seen before the GTY((user)) marking.
+
2013-08-16 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR target/58105
diff --git a/gcc/gengtype.c b/gcc/gengtype.c
index 2085496..9c12752 100644
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@ -559,6 +559,12 @@ type_p
create_user_defined_type (const char *type_name, struct fileloc *pos)
{
type_p ty = find_structure (type_name, TYPE_USER_STRUCT);
+
+ /* We might have already seen an incomplete decl of the given type,
+ in which case we won't have yet seen a GTY((user)), and the type will
+ only have kind "TYPE_STRUCT". Mark it as a user struct. */
+ ty->kind = TYPE_USER_STRUCT;
+
ty->u.s.line = *pos;
ty->u.s.bitmap = get_lang_bitmap (pos->file);
do_typedef (type_name, ty, pos);