https://github.com/HerrCai0907 created https://github.com/llvm/llvm-project/pull/118820
None >From 0a263b84b7af55db3619bcf4b5fcb07d5cbb5084 Mon Sep 17 00:00:00 2001 From: Congcong Cai <congcongcai0...@163.com> Date: Thu, 5 Dec 2024 23:04:13 +0800 Subject: [PATCH] [clang-tidy][NFC] move AST_MATCHER to namespace in InfiniteLoopCheck --- .../clang-tidy/bugprone/InfiniteLoopCheck.cpp | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp index 2b2d80ea9346bd..b7f0c08b2a7d4b 100644 --- a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp @@ -13,13 +13,15 @@ #include "clang/Analysis/Analyses/ExprMutationAnalyzer.h" #include "clang/Analysis/CallGraph.h" #include "llvm/ADT/SCCIterator.h" -#include "llvm/ADT/SmallVector.h" using namespace clang::ast_matchers; +using clang::ast_matchers::internal::Matcher; using clang::tidy::utils::hasPtrOrReferenceInFunc; namespace clang { -namespace ast_matchers { +namespace tidy::bugprone { + +namespace { /// matches a Decl if it has a "no return" attribute of any kind AST_MATCHER(Decl, declHasNoReturnAttr) { return Node.hasAttr<NoReturnAttr>() || Node.hasAttr<CXX11NoReturnAttr>() || @@ -30,23 +32,21 @@ AST_MATCHER(Decl, declHasNoReturnAttr) { AST_MATCHER(FunctionType, typeHasNoReturnAttr) { return Node.getNoReturnAttr(); } -} // namespace ast_matchers -namespace tidy::bugprone { +} // namespace -static internal::Matcher<Stmt> -loopEndingStmt(internal::Matcher<Stmt> Internal) { - internal::Matcher<QualType> isNoReturnFunType = +static Matcher<Stmt> loopEndingStmt(Matcher<Stmt> Internal) { + Matcher<QualType> IsNoReturnFunType = ignoringParens(functionType(typeHasNoReturnAttr())); - internal::Matcher<Decl> isNoReturnDecl = - anyOf(declHasNoReturnAttr(), functionDecl(hasType(isNoReturnFunType)), - varDecl(hasType(blockPointerType(pointee(isNoReturnFunType))))); + Matcher<Decl> IsNoReturnDecl = + anyOf(declHasNoReturnAttr(), functionDecl(hasType(IsNoReturnFunType)), + varDecl(hasType(blockPointerType(pointee(IsNoReturnFunType))))); return stmt(anyOf( mapAnyOf(breakStmt, returnStmt, gotoStmt, cxxThrowExpr).with(Internal), callExpr(Internal, callee(mapAnyOf(functionDecl, /* block callee */ varDecl) - .with(isNoReturnDecl))), - objcMessageExpr(Internal, callee(isNoReturnDecl)))); + .with(IsNoReturnDecl))), + objcMessageExpr(Internal, callee(IsNoReturnDecl)))); } /// Return whether `Var` was changed in `LoopStmt`. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits