Author: Zeyi Xu
Date: 2026-10-30T06:13:57Z
New Revision: 7700e31e581d5380ded5e0b0b5709c8cc33b94c3

URL: 
https://github.com/llvm/llvm-project/commit/7700e31e581d5380ded5e0b0b5709c8cc33b94c3
DIFF: 
https://github.com/llvm/llvm-project/commit/7700e31e581d5380ded5e0b0b5709c8cc33b94c3.diff

LOG: [clang-tidy][NFC] Move isOverloadedOperator matcher into utils::Matchers 
(#228548)

AI Usage: Assisted by Grok 4.6 (Cursor)

Co-authored-by: Cursor <[email protected]>

Added: 
    

Modified: 
    clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.cpp
    clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
    
clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp
    clang-tools-extra/clang-tidy/utils/Matchers.h

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.cpp 
b/clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.cpp
index 07dc77b5dee0ac..3a73517d8ebaf7 100644
--- a/clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/VirtualNearMissCheck.cpp
@@ -7,21 +7,19 @@
 
//===----------------------------------------------------------------------===//
 
 #include "VirtualNearMissCheck.h"
+#include "../utils/Matchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/CXXInheritance.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Lex/Lexer.h"
 
 using namespace clang::ast_matchers;
+using namespace clang::tidy::matchers;
 
 namespace clang::tidy::bugprone {
 
 namespace {
 AST_MATCHER(CXXMethodDecl, isStatic) { return Node.isStatic(); }
-
-AST_MATCHER(CXXMethodDecl, isOverloadedOperator) {
-  return Node.isOverloadedOperator();
-}
 } // namespace
 
 /// Finds out if the given method overrides some method.

diff  --git a/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp 
b/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
index 5edb443d0fca5c..08900501586acf 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseNodiscardCheck.cpp
@@ -7,12 +7,14 @@
 
//===----------------------------------------------------------------------===//
 
 #include "UseNodiscardCheck.h"
+#include "../utils/Matchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Type.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 
 using namespace clang::ast_matchers;
+using namespace clang::tidy::matchers;
 
 namespace clang::tidy::modernize {
 
@@ -28,10 +30,6 @@ static bool doesNoDiscardMacroExist(ASTContext &Context,
 }
 
 namespace {
-AST_MATCHER(CXXMethodDecl, isOverloadedOperator) {
-  // Don't put ``[[nodiscard]]`` in front of operators.
-  return Node.isOverloadedOperator();
-}
 AST_MATCHER(CXXMethodDecl, isConversionOperator) {
   // Don't put ``[[nodiscard]]`` in front of a conversion decl
   // like operator bool().

diff  --git 
a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp
 
b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp
index 1671743db2186c..b2b420283190d0 100644
--- 
a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp
+++ 
b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStaticCheck.cpp
@@ -7,6 +7,7 @@
 
//===----------------------------------------------------------------------===//
 
 #include "ConvertMemberFunctionsToStaticCheck.h"
+#include "../utils/Matchers.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/DeclCXX.h"
 #include "clang/AST/RecursiveASTVisitor.h"
@@ -15,6 +16,7 @@
 #include "clang/Lex/Lexer.h"
 
 using namespace clang::ast_matchers;
+using namespace clang::tidy::matchers;
 
 namespace clang::tidy::readability {
 
@@ -24,10 +26,6 @@ AST_MATCHER(CXXMethodDecl, isStatic) { return 
Node.isStatic(); }
 
 AST_MATCHER(CXXMethodDecl, hasTrivialBody) { return Node.hasTrivialBody(); }
 
-AST_MATCHER(CXXMethodDecl, isOverloadedOperator) {
-  return Node.isOverloadedOperator();
-}
-
 AST_MATCHER(CXXRecordDecl, hasAnyDependentBases) {
   return Node.hasAnyDependentBases();
 }

diff  --git a/clang-tools-extra/clang-tidy/utils/Matchers.h 
b/clang-tools-extra/clang-tidy/utils/Matchers.h
index f16c46ff5b662c..fb39fde05f756c 100644
--- a/clang-tools-extra/clang-tidy/utils/Matchers.h
+++ b/clang-tools-extra/clang-tidy/utils/Matchers.h
@@ -22,6 +22,10 @@ AST_MATCHER(BinaryOperator, isRelationalOperator) {
 
 AST_MATCHER(BinaryOperator, isEqualityOperator) { return Node.isEqualityOp(); }
 
+AST_MATCHER(FunctionDecl, isOverloadedOperator) {
+  return Node.isOverloadedOperator();
+}
+
 AST_MATCHER(Decl, isOutOfLine) { return Node.isOutOfLine(); }
 
 AST_MATCHER(VarDecl, isLocalVarDecl) { return Node.isLocalVarDecl(); }


        
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to