diff options
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-decl.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index d0fbaba..f814833 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2016-02-24 Marek Polacek <polacek@redhat.com> + + PR c/69819 + * c-decl.c (finish_decl): Don't update the copy of the type of a + different decl type. + 2016-02-23 Jakub Jelinek <jakub@redhat.com> PR objc/69844 diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 8e332f8..298036a 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -4743,7 +4743,7 @@ finish_decl (tree decl, location_t init_loc, tree init, struct c_binding *b_ext = I_SYMBOL_BINDING (DECL_NAME (decl)); while (b_ext && !B_IN_EXTERNAL_SCOPE (b_ext)) b_ext = b_ext->shadowed; - if (b_ext) + if (b_ext && TREE_CODE (decl) == TREE_CODE (b_ext->decl)) { if (b_ext->u.type && comptypes (b_ext->u.type, type)) b_ext->u.type = composite_type (b_ext->u.type, type); |