diff options
| author | Markus Trippelsdorf <markus@trippelsdorf.de> | 2014-09-04 12:37:05 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-09-04 08:37:05 -0400 |
| commit | 382995f56c4d9e8a752577d0a4207b09d5802740 (patch) | |
| tree | 2e5dd8a129c04fbbc2b50a49c3bef60ed158d39a /gcc | |
| parent | 5c153812634ad41f3bb616a77a29db64b6efdb5d (diff) | |
| download | gcc-382995f56c4d9e8a752577d0a4207b09d5802740.zip gcc-382995f56c4d9e8a752577d0a4207b09d5802740.tar.gz gcc-382995f56c4d9e8a752577d0a4207b09d5802740.tar.bz2 | |
re PR ipa/61659 (Extra undefined symbol because of devirtualization)
PR ipa/61659
* decl.c (duplicate_decls): Check DECL_DECLARED_INLINE_P on
newdecl, not olddecl.
From-SVN: r214900
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/spec38.C | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 258fd9b..cce5739 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-09-04 Markus Trippelsdorf <markus@trippelsdorf.de> + + PR ipa/61659 + * decl.c (duplicate_decls): Check DECL_DECLARED_INLINE_P on + newdecl, not olddecl. + 2014-09-02 Paolo Carlini <paolo.carlini@oracle.com> DR 1453 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d03f8a4..d8fb35e 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2215,7 +2215,7 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) olddecl); SET_DECL_TEMPLATE_SPECIALIZATION (olddecl); - DECL_COMDAT (newdecl) = DECL_DECLARED_INLINE_P (olddecl); + DECL_COMDAT (newdecl) = DECL_DECLARED_INLINE_P (newdecl); /* Don't propagate visibility from the template to the specialization here. We'll do that in determine_visibility if diff --git a/gcc/testsuite/g++.dg/template/spec38.C b/gcc/testsuite/g++.dg/template/spec38.C new file mode 100644 index 0000000..6f06f14 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/spec38.C @@ -0,0 +1,6 @@ +// PR ipa/61659 + +// { dg-final { scan-assembler "_Z1fIiEvPT_" } } + +template <typename T> inline void f (T *); +template <> void f (int *) { } |