From e7930c6750d03b28d922ebbbace20ba9d8622c6a Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Fri, 3 Feb 2023 09:12:31 -0500 Subject: [PATCH] c++: excessive satisfaction in check_methods [PR108579] In check_methods we're unnecessarily checking satisfaction for all constructors and assignment operators, even those that don't look like copy/move special members. In the testcase below this manifests as an unstable satisfaction error because the satisfaction result is first determined to be false during check_methods (since A is incomplete at this point) and later true after completion of A. This patch fixes this simply by swapping the order of the constraint_satisfied_p and copy/move_fn_p tests. PR c++/108579 gcc/cp/ChangeLog: * class.cc (check_methods): Swap order of constraints_satisfied_p and copy/move_fn_p tests. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-pr108579.C: New test. --- gcc/cp/class.cc | 16 ++++++++-------- gcc/testsuite/g++.dg/cpp2a/concepts-pr108579.C | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/concepts-pr108579.C diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index a2aa6674590b..40e6b7365a8a 100644 --- a/gcc/cp/class.cc +++ b/gcc/cp/class.cc @@ -4822,11 +4822,11 @@ check_methods (tree t) /* Might be trivial. */; else if (TREE_CODE (fn) == TEMPLATE_DECL) /* Templates are never special members. */; - else if (!constraints_satisfied_p (fn)) - /* Not eligible. */; - else if (copy_fn_p (fn)) + else if (copy_fn_p (fn) + && constraints_satisfied_p (fn)) TYPE_HAS_COMPLEX_COPY_CTOR (t) = true; - else if (move_fn_p (fn)) + else if (move_fn_p (fn) + && constraints_satisfied_p (fn)) TYPE_HAS_COMPLEX_MOVE_CTOR (t) = true; } @@ -4836,11 +4836,11 @@ check_methods (tree t) /* Might be trivial. */; else if (TREE_CODE (fn) == TEMPLATE_DECL) /* Templates are never special members. */; - else if (!constraints_satisfied_p (fn)) - /* Not eligible. */; - else if (copy_fn_p (fn)) + else if (copy_fn_p (fn) + && constraints_satisfied_p (fn)) TYPE_HAS_COMPLEX_COPY_ASSIGN (t) = true; - else if (move_fn_p (fn)) + else if (move_fn_p (fn) + && constraints_satisfied_p (fn)) TYPE_HAS_COMPLEX_MOVE_ASSIGN (t) = true; } } diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-pr108579.C b/gcc/testsuite/g++.dg/cpp2a/concepts-pr108579.C new file mode 100644 index 000000000000..f8721f0ab865 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-pr108579.C @@ -0,0 +1,14 @@ +// PR c++/108579 +// { dg-do compile { target c++20 } } + +template +struct A { + A(double, char); + A(int) requires requires { A(0.0, 'c'); }; + A& operator=(int) requires requires { A(1.0, 'd'); }; +}; + +int main() { + A a(3); + a = 5; +} -- 2.47.2