[Bug c/52181] [4.7 Regression] merge_decls doesn't handle DECL_USER_ALIGN properly

[jakub at gcc dot gnu.org]

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52181

--- Comment #3 from Jakub Jelinek <jakub at gcc dot gnu.org> 2012-02-14 
06:15:42 UTC ---
Author: jakub
Date: Tue Feb 14 06:15:35 2012
New Revision: 184193

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=184193
Log:
    PR c/52181
    * c-decl.c (merge_decls): Copy DECL_USER_ALIGN bit from olddecl to
    newdecl.

    * decl.c (duplicate_decls): If olddecl has bigger DECL_ALIGN than
    newdecl, copy DECL_ALIGN to newdecl and or DECL_USER_ALIGN bits.

    * c-c++-common/pr52181.c: New test.

Added:
    trunk/gcc/testsuite/c-c++-common/pr52181.c
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/c-decl.c
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/decl.c
    trunk/gcc/testsuite/ChangeLog