diff options
| author | Patrick Palka <ppalka@redhat.com> | 2020-07-29 22:06:36 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2020-08-11 08:56:32 -0400 |
| commit | 745ba1024c653324f9f0b88968c6f8989ed1e093 (patch) | |
| tree | 43c5400a45a4bee3816d3500e434404e3504a441 | |
| parent | 9040b14da7070f30af6d2814097fb7ea1a91707d (diff) | |
| download | gcc-745ba1024c653324f9f0b88968c6f8989ed1e093.tar.gz | |
c++: abbreviated function template friend matching [PR96106]
In the below testcase, duplicate_decls wasn't merging the tsubsted
friend declaration for 'void add(auto)' with its definition, because
reduce_template_parm_level (during tsubst_friend_function) lost the
DECL_VIRTUAL_P flag on the auto's invented template parameter, which
caused template_heads_equivalent_p to deem the two template heads as not
equivalent in C++20 mode.
This patch makes reduce_template_parm_level carry over the
DECL_VIRTUAL_P flag from the original TEMPLATE_PARM_DECL.
gcc/cp/ChangeLog:
PR c++/96106
* pt.c (reduce_template_parm_level): Propagate DECL_VIRTUAL_P
from the original TEMPLATE_PARM_DECL to the new lowered one.
gcc/testsuite/ChangeLog:
PR c++/96106
* g++.dg/concepts/abbrev7.C: New test.
(cherry picked from commit f31dd9beb95f4beda1d2bd5c0526c42d0ce455c4)
| -rw-r--r-- | gcc/cp/pt.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/abbrev7.C | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 16c2a0068c8..f05f9a69900 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4453,6 +4453,7 @@ reduce_template_parm_level (tree index, tree type, int levels, tree args, type); TREE_CONSTANT (decl) = TREE_CONSTANT (orig_decl); TREE_READONLY (decl) = TREE_READONLY (orig_decl); + DECL_VIRTUAL_P (decl) = DECL_VIRTUAL_P (orig_decl); DECL_ARTIFICIAL (decl) = 1; SET_DECL_TEMPLATE_PARM_P (decl); diff --git a/gcc/testsuite/g++.dg/concepts/abbrev7.C b/gcc/testsuite/g++.dg/concepts/abbrev7.C new file mode 100644 index 00000000000..443c1b7871b --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/abbrev7.C @@ -0,0 +1,14 @@ +// PR c++/96106 +// { dg-do compile { target concepts } } + +template<typename> +struct number { + friend void add(auto); +}; + +void add(auto) { } + +void foo() { + number<int> n; + add(n); // { dg-bogus "ambiguous" } +} |