diff options
| -rw-r--r-- | gcc/cp/class.c | 15 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/pr95181-2.C | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/pr95181.C | 9 |
3 files changed, 28 insertions, 4 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index ca492cd..c818826 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1081,12 +1081,19 @@ add_method (tree type, tree method, bool via_using) { if (!equivalently_constrained (fn, method)) { + if (processing_template_decl) + /* We can't check satisfaction in dependent context, wait until + the class is instantiated. */ + continue; + special_function_kind sfk = special_memfn_p (method); - if (sfk == sfk_none || DECL_INHERITED_CTOR (fn)) - /* Non-special member functions coexist if they are not - equivalently constrained. A member function is not hidden - by an inherited constructor. */ + if (sfk == sfk_none + || DECL_INHERITED_CTOR (fn) + || TREE_CODE (fn) == TEMPLATE_DECL) + /* Member function templates and non-special member functions + coexist if they are not equivalently constrained. A member + function is not hidden by an inherited constructor. */ continue; /* P0848: For special member functions, deleted, unsatisfied, or diff --git a/gcc/testsuite/g++.dg/concepts/pr95181-2.C b/gcc/testsuite/g++.dg/concepts/pr95181-2.C new file mode 100644 index 0000000..6d67350 --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/pr95181-2.C @@ -0,0 +1,8 @@ +// { dg-do compile { target concepts } } + +template<bool B> struct g { + g() requires B && false; + g() requires B; +}; + +g<true> b; // error diff --git a/gcc/testsuite/g++.dg/concepts/pr95181.C b/gcc/testsuite/g++.dg/concepts/pr95181.C new file mode 100644 index 0000000..0185c86 --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/pr95181.C @@ -0,0 +1,9 @@ +// PR c++/95181 +// { dg-do compile { target concepts } } + +template <typename> struct f { + template <typename T=int> f(); + template <typename T=int> requires false f(); +}; + +f<int> a; |