aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2023-02-03 09:12:31 -0500
committerPatrick Palka <ppalka@redhat.com>2023-02-03 09:12:31 -0500
commite7930c6750d03b28d922ebbbace20ba9d8622c6a (patch)
tree9cb5a58ce1711377f7bdeb4489da975119130c2a /gcc/cp
parente8109bd87766be88e83fe88a44433dae16358a02 (diff)
downloadgcc-e7930c6750d03b28d922ebbbace20ba9d8622c6a.zip
gcc-e7930c6750d03b28d922ebbbace20ba9d8622c6a.tar.gz
gcc-e7930c6750d03b28d922ebbbace20ba9d8622c6a.tar.bz2
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<int> is incomplete at this point) and later true after completion of A<int>. 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.
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/class.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc
index a2aa667..40e6b73 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;
}
}