diff options
author | Patrick Palka <ppalka@redhat.com> | 2023-01-04 14:12:25 -0500 |
---|---|---|
committer | Patrick Palka <ppalka@redhat.com> | 2023-01-04 14:12:25 -0500 |
commit | 238e292cf5d822f3bd12d9b58eb04cf377758b2a (patch) | |
tree | c2ee369fd5e91ad6a5ae9332e8be96d523224352 | |
parent | fc349931adcf1024ee95e0a0cd98cf4a41996093 (diff) | |
download | gcc-238e292cf5d822f3bd12d9b58eb04cf377758b2a.zip gcc-238e292cf5d822f3bd12d9b58eb04cf377758b2a.tar.gz gcc-238e292cf5d822f3bd12d9b58eb04cf377758b2a.tar.bz2 |
c++: mark_single_function and SFINAE [PR108282]
We typically ignore mark_used failure when in a non-SFINAE context for
sake of better error recovery. But in mark_single_function we're
instead ignoring mark_used failure in a SFINAE context, which ends up
causing the second static_assert here to incorrectly fail.
PR c++/108282
gcc/cp/ChangeLog:
* decl2.cc (mark_single_function): Ignore mark_used failure
only in a non-SFINAE context rather than in a SFINAE one.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/concepts-requires34.C: New test.
-rw-r--r-- | gcc/cp/decl2.cc | 2 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-requires34.C | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index f95529a..00ed64d 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -5600,7 +5600,7 @@ mark_single_function (tree expr, tsubst_flags_t complain) if (is_overloaded_fn (expr) == 1 && !mark_used (expr, complain) - && (complain & tf_error)) + && !(complain & tf_error)) return false; return true; } diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-requires34.C b/gcc/testsuite/g++.dg/cpp2a/concepts-requires34.C new file mode 100644 index 0000000..5bbd62f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-requires34.C @@ -0,0 +1,19 @@ +// PR c++/108282 +// { dg-do compile { target c++20 } } + +template<class T> +concept TEST = requires { T::TT; }; + +struct C { }; + +template<class AT> +struct B { + static void TT() requires TEST<AT>; +}; + +int main() { + static_assert( !TEST<C> ); + static_assert( !TEST<B<C>> ); + + B<C>::TT(); // { dg-error "no match" } +} |