address review comments

Author: cor3ntin

clang/docs/ReleaseNotes.rst

@@ -209,7 +209,7 @@ C++23 Feature Support
 - Added a ``__reference_converts_from_temporary`` builtin, completing the necessary compiler support for
   `P2255R2: Type trait to determine if a reference binds to a temporary <https://wg21.link/P2255R2>`_.
 
-- Implemented `P2797R0: Static and explicit object member functions with the same parameter-type-lists <https://wg21.link/P2797R0>`.
+- Implemented `P2797R0: Static and explicit object member functions with the same parameter-type-lists <https://wg21.link/P2797R0>`_.
   This completes the support for "deducing this".
 
 C++2c Feature Support

clang/lib/Sema/SemaOverload.cpp

@@ -7554,11 +7554,16 @@ Sema::AddMethodCandidate(CXXMethodDecl *Method, DeclAccessPair FoundDecl,
       (Method->isExplicitObjectMemberFunction() &&
        CandidateSet.getKind() ==
            OverloadCandidateSet::CSK_AddressOfOverloadSet);
+  bool ImplicitObjectMethodTreatedAsStatic =
+      CandidateSet.getKind() ==
+          OverloadCandidateSet::CSK_AddressOfOverloadSet &&
+      Method->isImplicitObjectMemberFunction();
+
   unsigned ExplicitOffset =
       !IgnoreExplicitObject && Method->isExplicitObjectMemberFunction() ? 1 : 0;
-  unsigned NumParams = Method->getNumParams() - ExplicitOffset;
-  if (CandidateSet.getKind() == OverloadCandidateSet::CSK_AddressOfOverloadSet)
-    NumParams += int(Method->isImplicitObjectMemberFunction());
+
+  unsigned NumParams = Method->getNumParams() - ExplicitOffset +
+                       int(ImplicitObjectMethodTreatedAsStatic);
 
   // (C++ 13.3.2p2): A candidate function having fewer than m
   // parameters is viable only if it has an ellipsis in its parameter
@@ -7576,11 +7581,9 @@ Sema::AddMethodCandidate(CXXMethodDecl *Method, DeclAccessPair FoundDecl,
   // (8.3.6). For the purposes of overload resolution, the
   // parameter list is truncated on the right, so that there are
   // exactly m parameters.
-  unsigned MinRequiredArgs = Method->getMinRequiredArguments() - ExplicitOffset;
-  if (CandidateSet.getKind() ==
-          OverloadCandidateSet::CSK_AddressOfOverloadSet &&
-      Method->isImplicitObjectMemberFunction())
-    MinRequiredArgs++;
+  unsigned MinRequiredArgs = Method->getMinRequiredArguments() -
+                             ExplicitOffset +
+                             int(ImplicitObjectMethodTreatedAsStatic);
 
   if (Args.size() < MinRequiredArgs && !PartialOverloading) {
     // Not enough arguments.
@@ -7652,9 +7655,7 @@ Sema::AddMethodCandidate(CXXMethodDecl *Method, DeclAccessPair FoundDecl,
       // (13.3.3.1) that converts that argument to the corresponding
       // parameter of F.
       QualType ParamType;
-      if (CandidateSet.getKind() ==
-              OverloadCandidateSet::CSK_AddressOfOverloadSet &&
-          Method->isImplicitObjectMemberFunction()) {
+      if (ImplicitObjectMethodTreatedAsStatic) {
         ParamType = ArgIdx == 0
                         ? Method->getFunctionObjectParameterReferenceType()
                         : Proto->getParamType(ArgIdx - 1);
@@ -16402,8 +16403,8 @@ ExprResult Sema::FixOverloadedFunctionReference(Expr *E, DeclAccessPair Found,
            "Can only take the address of an overloaded function");
     if (CXXMethodDecl *Method = dyn_cast<CXXMethodDecl>(Fn)) {
       if (!Method->isImplicitObjectMemberFunction()) {
-        // Do nothing: static member functions aren't any different
-        // from non-member functions.
+        // Do nothing: the address of static and
+        // explicit object member functions is a (non-member) function pointer.
       } else {
         // Fix the subexpression, which really has to be an
         // UnresolvedLookupExpr holding an overloaded member function

clang/test/CXX/drs/cwg26xx.cpp

@@ -242,8 +242,8 @@ void test() {
 #endif
 
 
-#if __cplusplus >= 202302L
 namespace cwg2692 { // cwg2692: 19
+#if __cplusplus >= 202302L
 
  struct A {
     static void f(A); // #cwg2692-1
@@ -253,16 +253,17 @@ namespace cwg2692 { // cwg2692: 19
   };
 
   void A::g() {
-    (&A::f)(A()); // expected-error {{call to 'f' is ambiguous}}
-                  // expected-note@#cwg2692-1 {{candidate}}
-                  // expected-note@#cwg2692-2 {{candidate}}
+    (&A::f)(A());
+    // expected-error@-1 {{call to 'f' is ambiguous}}
+    // expected-note@#cwg2692-1 {{candidate}}
+    // expected-note@#cwg2692-2 {{candidate}}
 
 
 
-    (&A::f)();    // expected-error {{no matching function for call to 'f'}}
-                  // expected-note@#cwg2692-1 {{candidate function not viable: requires 1 argument, but 0 were provided}}
-                  // expected-note@#cwg2692-2 {{candidate function not viable: requires 1 argument, but 0 were provided}}
+    (&A::f)();
+    // expected-error@-1 {{no matching function for call to 'f'}}
+    // expected-note@#cwg2692-1 {{candidate function not viable: requires 1 argument, but 0 were provided}}
+    // expected-note@#cwg2692-2 {{candidate function not viable: requires 1 argument, but 0 were provided}}
   }
-
-}
 #endif
+}

clang/test/CXX/drs/cwg2771.cpp

@@ -15,4 +15,5 @@ struct A{
 // CXX23-NEXT: UnaryOperator
 // CXX23-NEXT: MemberExpr
 // CXX23-NEXT: CXXThisExpr{{.+}}'cwg2771::A *'
-}
+
+} // namespace cwg2771