Merge pull request #66114 from beccadax/implementation-warnings

[NFC] Use method for more @objcImpl diagnostics

Author: beccadax

lib/Sema/TypeCheckDeclObjC.cpp

@@ -3116,13 +3116,13 @@ class ObjCImplementationChecker {
       }
 
       // Ambiguous match (many requirements match one candidate)
-      cand->diagnose(diag::objc_implementation_multiple_matching_requirements,
+      diagnose(cand, diag::objc_implementation_multiple_matching_requirements,
                      cand->getDescriptiveKind(), cand);
 
       bool shouldOfferFix = !candExplicitObjCName;
       for (auto req : matchedRequirements.matches) {
         auto diag =
-            cand->diagnose(diag::objc_implementation_one_matched_requirement,
+            diagnose(cand, diag::objc_implementation_one_matched_requirement,
                            req->getDescriptiveKind(), req,
                            *req->getObjCRuntimeName(), shouldOfferFix,
                            req->getObjCRuntimeName()->getString(scratch));
@@ -3165,14 +3165,14 @@ class ObjCImplementationChecker {
           cast<IterableDeclContext>(req->getDeclContext()->getAsDecl());
       auto ext =
           cast<ExtensionDecl>(reqIDC->getImplementationContext());
-      ext->diagnose(diag::objc_implementation_multiple_matching_candidates,
+      diagnose(ext, diag::objc_implementation_multiple_matching_candidates,
                     req->getDescriptiveKind(), req,
                     *req->getObjCRuntimeName());
 
       for (auto cand : cands.matches) {
         bool shouldOfferFix = !unmatchedCandidates[cand];
         auto diag =
-            cand->diagnose(diag::objc_implementation_candidate_impl_here,
+            diagnose(cand, diag::objc_implementation_candidate_impl_here,
                            cand->getDescriptiveKind(), cand, shouldOfferFix,
                            req->getObjCRuntimeName()->getString(scratch));
 
@@ -3183,7 +3183,7 @@ class ObjCImplementationChecker {
         }
       }
 
-      req->diagnose(diag::objc_implementation_requirement_here,
+      diagnose(req, diag::objc_implementation_requirement_here,
                     req->getDescriptiveKind(), req);
     }