https://github.com/zeyi2 updated https://github.com/llvm/llvm-project/pull/228548
>From a29ffbc35ede591f78fe061e031dc2b732442ee6 Mon Sep 17 00:00:00 2001 From: Zeyi Xu <[email protected]> Date: Sat, 3 Oct 2026 02:29:46 +0800 Subject: [PATCH] [clang-tidy][NFC] Move isOverloadedOperator matcher into utils::Matchers Co-authored-by: Cursor <[email protected]> --- .../clang-tidy/bugprone/VirtualNearMissCheck.cpp | 6 ++---- .../clang-tidy/modernize/UseNodiscardCheck.cpp | 6 ++---- .../readability/ConvertMemberFunctionsToStaticCheck.cpp | 6 ++---- clang-tools-extra/clang-tidy/utils/Matchers.h | 4 ++++ 4 files changed, 10 insertions(+), 12 deletions(-) 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 e04da473226239..44595ea98a5dde 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(QualType, isExpensiveToCopy) { std::optional<bool> IsExpensive = utils::type_traits::isExpensiveToCopy(Node, Finder->getASTContext()); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
