diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-01 21:58:04 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-01 21:58:04 +0000 |
| commit | d73f0fde7ff56581799a3342f7d0b90747ef98fe (patch) | |
| tree | c42ee149769501f86bccda8c4b55a1d89c5c6616 | |
| parent | 80ddf9f9fff60e99472c1dd4cfad00408c7769a9 (diff) | |
| download | gcc-d73f0fde7ff56581799a3342f7d0b90747ef98fe.tar.gz | |
PR c++/41611
* decl2.c (get_guard): Copy DECL_COMDAT.
(comdat_linkage): Set DECL_COMDAT unconditionally.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@154885 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/guard1.C | 10 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c18533368db..f0b9d7f9f32 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2009-12-01 Jason Merrill <jason@redhat.com> + + PR c++/41611 + * decl2.c (get_guard): Copy DECL_COMDAT. + (comdat_linkage): Set DECL_COMDAT unconditionally. + 2009-12-01 Jakub Jelinek <jakub@redhat.com> PR c++/3187 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index c0febad2515..1cd2ded03a3 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1574,8 +1574,7 @@ comdat_linkage (tree decl) } } - if (DECL_LANG_SPECIFIC (decl)) - DECL_COMDAT (decl) = 1; + DECL_COMDAT (decl) = 1; } /* For win32 we also want to put explicit instantiations in @@ -2555,6 +2554,7 @@ get_guard (tree decl) TREE_PUBLIC (guard) = TREE_PUBLIC (decl); TREE_STATIC (guard) = TREE_STATIC (decl); DECL_COMMON (guard) = DECL_COMMON (decl); + DECL_COMDAT (guard) = DECL_COMDAT (decl); DECL_COMDAT_GROUP (guard) = DECL_COMDAT_GROUP (decl); if (TREE_PUBLIC (decl)) DECL_WEAK (guard) = DECL_WEAK (decl); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b73a1420a94..2b856c28b8c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-12-01 Jason Merrill <jason@redhat.com> + + PR c++/41611 + * g++.dg/abi/guard1.C: New. + 2009-12-91 Uros Bizjak <ubizjak@gmail.com> * gcc.target/i386/vperm-v4sf-1.c (dg-options): Use -msse. diff --git a/gcc/testsuite/g++.dg/abi/guard1.C b/gcc/testsuite/g++.dg/abi/guard1.C new file mode 100644 index 00000000000..76b43d30f36 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/guard1.C @@ -0,0 +1,10 @@ +// PR c++/41611 +// { dg-final { scan-assembler-not "_ZGVZN1A1fEvE1i" } } + +struct A { + static int f() + { + static int &i = *new int(); + return i; + } +}; |