diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/friend56.C | 13 |
3 files changed, 20 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f010207..3d85843 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2014-07-30 Jason Merrill <jason@redhat.com> + + PR lto/53808 + PR c++/61659 + * pt.c (push_template_decl_real): Don't set DECL_COMDAT on friends. + 2014-07-30 Paolo Carlini <paolo.carlini@oracle.com> PR c++/57397 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 33a8bf4..baabcb1 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5021,6 +5021,7 @@ template arguments to %qD do not match original template %qD", } if (flag_implicit_templates + && !is_friend && VAR_OR_FUNCTION_DECL_P (decl)) /* Set DECL_COMDAT on template instantiations; if we force them to be emitted by explicit instantiation or -frepo, diff --git a/gcc/testsuite/g++.dg/template/friend56.C b/gcc/testsuite/g++.dg/template/friend56.C new file mode 100644 index 0000000..7dd5d48 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend56.C @@ -0,0 +1,13 @@ +// Make sure we don't mistakenly mark f as DECL_COMDAT. +// { dg-final { scan-assembler "_Z1fv" } } + +void f(); + +template <class T> struct A +{ + friend void f(); +}; + +A<int> a; + +void f() { } |