From c2d474827dbd15616799ea703ea39659d7222dce Mon Sep 17 00:00:00 2001 From: Prathamesh Kulkarni Date: Tue, 2 Jun 2015 16:42:27 +0000 Subject: re PR target/49551 (tentative declaration after definition and -fdata-sections cause ICE in C front-end.) 2015-06-02 Prathamesh Kulkarni PR c/49551 * c-decl.c (merge_decls): Merge DECL_COMMON. * gcc.dg/pr49551.c: New test-case. From-SVN: r224033 --- gcc/c/ChangeLog | 5 +++++ gcc/c/c-decl.c | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'gcc/c') diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index bcad7b7..20122e6 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,8 @@ +2015-06-02 Prathamesh Kulkarni + + PR c/49551 + * c-decl.c (merge_decls): Merge DECL_COMMON. + 2015-05-22 Jim Wilson * Make-lang.in (check_gcc_pallelize): Define. diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index a2edefc..68c79df 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -2631,6 +2631,12 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) else if (DECL_PRESERVE_P (newdecl)) DECL_PRESERVE_P (olddecl) = 1; + /* Merge DECL_COMMON */ + if (VAR_P (olddecl) && VAR_P (newdecl) + && !lookup_attribute ("common", DECL_ATTRIBUTES (newdecl)) + && !lookup_attribute ("nocommon", DECL_ATTRIBUTES (newdecl))) + DECL_COMMON (newdecl) = DECL_COMMON (newdecl) && DECL_COMMON (olddecl); + /* Copy most of the decl-specific fields of NEWDECL into OLDDECL. But preserve OLDDECL's DECL_UID, DECL_CONTEXT and DECL_ARGUMENTS (if appropriate). */ -- cgit v1.1