diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -10256,10 +10256,19 @@ return false; if (!Satisfaction.IsSatisfied) { if (Complain) { - if (InOverloadResolution) + if (InOverloadResolution) { + SmallString<128> TemplateArgString; + if (FunctionTemplateDecl *FunTmpl = FD->getPrimaryTemplate()) { + TemplateArgString += " "; + TemplateArgString += S.getTemplateArgumentBindingsText( + FunTmpl->getTemplateParameters(), + *FD->getTemplateSpecializationArgs()); + } + S.Diag(FD->getBeginLoc(), - diag::note_ovl_candidate_unsatisfied_constraints); - else + diag::note_ovl_candidate_unsatisfied_constraints) + << TemplateArgString; + } else S.Diag(Loc, diag::err_addrof_function_constraints_not_satisfied) << FD; S.DiagnoseUnsatisfiedConstraint(Satisfaction); diff --git a/clang/test/SemaTemplate/concepts.cpp b/clang/test/SemaTemplate/concepts.cpp --- a/clang/test/SemaTemplate/concepts.cpp +++ b/clang/test/SemaTemplate/concepts.cpp @@ -208,3 +208,17 @@ return (int*)nullptr; // FIXME: should error } } + +namespace PR54379 { +template +struct A { + static void f() requires (N == 0) { return; } // expected-note {{candidate template ignored: constraints not satisfied}} expected-note {{evaluated to false}} + static void f() requires (N == 1) { return; } // expected-note {{candidate template ignored: constraints not satisfied}} expected-note {{evaluated to false}} +}; +void (*f1)() = A<2>::f; // expected-error {{address of overloaded function 'f' does not match required type}} + +struct B { + template static void f() requires (N2 == 0) { return; } // expected-note {{candidate template ignored: constraints not satisfied [with N2 = 1]}} expected-note {{evaluated to false}} +}; +void (*f2)() = B::f; // expected-error {{address of overloaded function 'f' does not match required type}} +}