diff options
| author | Jason Merrill <jason@redhat.com> | 2021-07-09 13:50:01 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2021-07-09 16:11:48 -0400 |
| commit | ddd25bd1a7c8f456bc914e34b77d43f39a1062d4 (patch) | |
| tree | af8f3ede0050bbaf3ae25927c5504c3f1891ff88 | |
| parent | d5b1bb0d197f9141a0f0e510f8d1b598c3df9552 (diff) | |
| download | gcc-ddd25bd1a7c8f456bc914e34b77d43f39a1062d4.zip gcc-ddd25bd1a7c8f456bc914e34b77d43f39a1062d4.tar.gz gcc-ddd25bd1a7c8f456bc914e34b77d43f39a1062d4.tar.bz2 | |
c++: concepts TS and explicit specialization [PR101098]
duplicate_decls was not recognizing the explicit specialization as matching
the implicit specialization of g<Y> because
function_requirements_equivalent_p was seeing the C constraint on the
implicit one and not on the explicit.
PR c++/101098
gcc/cp/ChangeLog:
* decl.c (function_requirements_equivalent_p): Only compare
trailing requirements on a specialization.
gcc/testsuite/ChangeLog:
* g++.dg/concepts/explicit-spec1.C: New test.
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/explicit-spec1.C | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index ebe1318..0df689b 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -955,7 +955,9 @@ static bool function_requirements_equivalent_p (tree newfn, tree oldfn) { /* In the concepts TS, the combined constraints are compared. */ - if (cxx_dialect < cxx20) + if (cxx_dialect < cxx20 + && (DECL_TEMPLATE_SPECIALIZATION (newfn) + <= DECL_TEMPLATE_SPECIALIZATION (oldfn))) { tree ci1 = get_constraints (oldfn); tree ci2 = get_constraints (newfn); diff --git a/gcc/testsuite/g++.dg/concepts/explicit-spec1.C b/gcc/testsuite/g++.dg/concepts/explicit-spec1.C new file mode 100644 index 0000000..d9b6b3d --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/explicit-spec1.C @@ -0,0 +1,9 @@ +// PR c++/101098 +// { dg-do compile { target concepts } } + +template<typename T> concept C = __is_class(T); +struct Y { int n; } y; +template<C T> void g(T) { } +int called; +template<> void g(Y) { called = 3; } +int main() { g(y); } |