From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 3BC413858C2F; Mon, 19 Feb 2024 16:35:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3BC413858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1708360532; bh=YqV5Z7jJ0NCkZuCQG2y306xs6dir2LA/6btJqVTtr9Y=; h=From:To:Subject:Date:From; b=lUWk/bmxCEwSPcE34e+DvSXkmr4vK0iMSgzbbSLBsJhV7ghTXGUqP0yQqzZCZKTYH G2YfmNOc116CsQe7CzO8523gqR+fQldft46Qa4MJyug7BiAbSsw+VL7W32c4VQQ4pc b4R96kq+aMJW8dq0VEADjsqjOVOUI2hOGiLsSiVI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-9066] c++: compound-requirement partial substitution [PR113966] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: b29f20b6e271b7cd1faad1ced9a55d92d00fcbfe X-Git-Newrev: 3a6f3354eaaf38b5e6be41e4ebf521d299593a6e Message-Id: <20240219163532.3BC413858C2F@sourceware.org> Date: Mon, 19 Feb 2024 16:35:32 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3a6f3354eaaf38b5e6be41e4ebf521d299593a6e commit r14-9066-g3a6f3354eaaf38b5e6be41e4ebf521d299593a6e Author: Patrick Palka Date: Mon Feb 19 11:34:45 2024 -0500 c++: compound-requirement partial substitution [PR113966] 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 Diff: --- gcc/cp/constraint.cc | 5 +++-- gcc/testsuite/g++.dg/cpp2a/concepts-friend17.C | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index d9569013bd34..49de3211d4c7 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -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 %", 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)) { diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-friend17.C b/gcc/testsuite/g++.dg/cpp2a/concepts-friend17.C new file mode 100644 index 000000000000..9b5091f14a81 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-friend17.C @@ -0,0 +1,15 @@ +// PR c++/113966 +// { dg-do compile { target c++20 } } + +template concept C = T::value; + +template +struct A { + template requires U::value || requires { { T() } -> C; } + friend void f(A, U) { } + + template requires requires { { g(U()) } noexcept; } + friend void f(A, U, U) { } +}; + +template struct A;