procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: compound-requirement partial substitution [PR113966]

Browse source 
When partially substituting a requires-expr, we don't want to perform
any additional checks beyond the substitution itself so as to minimize
checking requirements out of order.  So don't check the return-type-req
of a compound-requirement during partial substitution.  And don't check
the noexcept condition either since we can't do that on templated trees.

	PR c++/113966

gcc/cp/ChangeLog:

	* constraint.cc (tsubst_compound_requirement): Don't check
	the noexcept condition or the return-type-requirement when
	partially substituting.

gcc/testsuite/ChangeLog:

	* g++.dg/cpp2a/concepts-friend17.C: New test.

Reviewed-by: Jason Merrill <jason@redhat.com>
This commit is contained in:
Patrick Palka 2024-02-19 11:34:45 -05:00
parent b29f20b6e2
commit 3a6f3354ea
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/constraint.cc
View file

@ -2134,7 +2134,8 @@ tsubst_compound_requirement (tree t, tree args, sat_info info)
/* Check the noexcept condition. */
bool noexcept_p = COMPOUND_REQ_NOEXCEPT_P (t);
if (noexcept_p && !expr_noexcept_p (expr, quiet.complain))
if (noexcept_p && !processing_template_decl
&& !expr_noexcept_p (expr, quiet.complain))
{
if (info.diagnose_unsatisfaction_p ())
inform (loc, "%qE is not %<noexcept%>", expr);
@ -2148,7 +2149,7 @@ tsubst_compound_requirement (tree t, tree args, sat_info info)
return error_mark_node;
/* Check expression against the result type. */
if (type)
if (type && !processing_template_decl)
{
if (tree placeholder = type_uses_auto (type))
{

15
gcc/testsuite/g++.dg/cpp2a/concepts-friend17.C Normal file
View file

@ -0,0 +1,15 @@
// PR c++/113966
// { dg-do compile { target c++20 } }
template<class T> concept C = T::value;
template<class T>
struct A {
template<class U> requires U::value || requires { { T() } -> C; }
friend void f(A, U) { }
template<class U> requires requires { { g(U()) } noexcept; }
friend void f(A, U, U) { }
};
template struct A<int>;