diff options
| author | Marek Polacek <polacek@redhat.com> | 2016-01-09 11:15:26 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2016-01-09 11:15:26 +0000 |
| commit | 73f0dae2a4e1dc4fcfebc9f47f34381dff64f3c3 (patch) | |
| tree | 8d23f0ab47bfadfd26eaa229c149f93d65c72776 /gcc | |
| parent | 20b8d7342cc4920c79aebc0317150abe66068957 (diff) | |
| download | gcc-73f0dae2a4e1dc4fcfebc9f47f34381dff64f3c3.zip gcc-73f0dae2a4e1dc4fcfebc9f47f34381dff64f3c3.tar.gz gcc-73f0dae2a4e1dc4fcfebc9f47f34381dff64f3c3.tar.bz2 | |
re PR c++/69113 (ICE: in vague_linkage_p, at cp/decl2.c:1875 with -fno-weak)
PR c++/69113
* decl2.c (comdat_linkage): Only set DECL_COMDAT if TREE_PUBLIC is set.
* g++.dg/pr69113.C: New test.
From-SVN: r232189
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/pr69113.C | 17 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3ec2e1c..9aedf00 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2016-01-09 Marek Polacek <polacek@redhat.com> + + PR c++/69113 + * decl2.c (comdat_linkage): Only set DECL_COMDAT if TREE_PUBLIC is set. + 2016-01-09 Jakub Jelinek <jakub@redhat.com> PR c++/69164 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 9a07e1e..a7212ca0 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1820,7 +1820,8 @@ comdat_linkage (tree decl) } } - DECL_COMDAT (decl) = 1; + if (TREE_PUBLIC (decl)) + DECL_COMDAT (decl) = 1; } /* For win32 we also want to put explicit instantiations in diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 107ea24..4af4374 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-01-09 Marek Polacek <polacek@redhat.com> + + PR c++/69113 + * g++.dg/pr69113.C: New test. + 2016-01-09 Jakub Jelinek <jakub@redhat.com> PR middle-end/50865 diff --git a/gcc/testsuite/g++.dg/pr69113.C b/gcc/testsuite/g++.dg/pr69113.C new file mode 100644 index 0000000..2f8331e --- /dev/null +++ b/gcc/testsuite/g++.dg/pr69113.C @@ -0,0 +1,17 @@ +// PR c++/69113 +// { dg-do compile } +// { dg-options "-fno-weak" } + +struct foo +{ + static void bar () + { + struct baz + { + static void m () + { + static int n; + } + }; + } +}; |