This revision was automatically updated to reflect the committed changes.
Closed by commit rGea2225a10be9: [clang-tidy] Simplify readability checks to
not need ignoring* matchers (authored by stephenkelly).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D98296/new/
https://reviews.llvm.org/D98296
Files:
clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h
clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp
clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.h
clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h
clang-tools-extra/clang-tidy/readability/NamedParameterCheck.cpp
clang-tools-extra/clang-tidy/readability/NamedParameterCheck.h
clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.cpp
clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.h
clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.h
clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.cpp
clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.h
clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp
clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
Index: clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
+++ clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.h
@@ -28,6 +28,9 @@
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
template <typename LiteralType>
Index: clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/UppercaseLiteralSuffixCheck.cpp
@@ -196,12 +196,11 @@
// Sadly, we can't check whether the literal has suffix or not.
// E.g. i32 suffix still results in 'BuiltinType::Kind::Int'.
// And such an info is not stored in the *Literal itself.
- Finder->addMatcher(traverse(TK_AsIs,
+ Finder->addMatcher(
stmt(eachOf(integerLiteral().bind(IntegerLiteralCheck::Name),
floatLiteral().bind(FloatingLiteralCheck::Name)),
unless(anyOf(hasParent(userDefinedLiteral()),
- hasAncestor(isImplicit()),
- hasAncestor(substNonTypeTemplateParmExpr()))))),
+ hasAncestor(substNonTypeTemplateParmExpr())))),
this);
}
Index: clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
+++ clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h
@@ -26,6 +26,9 @@
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
const bool PreferResetCall;
Index: clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/UniqueptrDeleteReleaseCheck.cpp
@@ -39,17 +39,14 @@
Finder->addMatcher(
cxxDeleteExpr(
unless(isInTemplateInstantiation()),
- has(expr(ignoringParenImpCasts(
- cxxMemberCallExpr(
- callee(
- memberExpr(hasObjectExpression(allOf(
- unless(isTypeDependent()),
- anyOf(hasType(UniquePtrWithDefaultDelete),
- hasType(pointsTo(
- UniquePtrWithDefaultDelete))))),
- member(cxxMethodDecl(hasName("release"))))
- .bind("release_expr")))
- .bind("release_call")))))
+ has(cxxMemberCallExpr(
+ callee(memberExpr(hasObjectExpression(anyOf(
+ hasType(UniquePtrWithDefaultDelete),
+ hasType(pointsTo(
+ UniquePtrWithDefaultDelete)))),
+ member(cxxMethodDecl(hasName("release"))))
+ .bind("release_expr")))
+ .bind("release_call")))
.bind("delete"),
this);
}
Index: clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
+++ clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h
@@ -30,6 +30,9 @@
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
const unsigned NameSpecifierNestingThreshold;
Index: clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp
@@ -39,8 +39,7 @@
void StaticAccessedThroughInstanceCheck::registerMatchers(MatchFinder *Finder) {
Finder->addMatcher(
memberExpr(hasDeclaration(anyOf(cxxMethodDecl(isStaticStorageClass()),
- varDecl(hasStaticStorageDuration()))),
- unless(isInTemplateInstantiation()))
+ varDecl(hasStaticStorageDuration()))))
.bind("memberExpression"),
this);
}
Index: clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.h
+++ clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.h
@@ -28,6 +28,9 @@
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
void storeOptions(ClangTidyOptions::OptionMap& Opts) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
const std::vector<std::string> Types;
Index: clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/SimplifySubscriptExprCheck.cpp
@@ -32,7 +32,7 @@
llvm::SmallVector<StringRef, 8>(Types.begin(), Types.end()))))));
Finder->addMatcher(
- arraySubscriptExpr(hasBase(ignoringParenImpCasts(
+ arraySubscriptExpr(hasBase(
cxxMemberCallExpr(
has(memberExpr().bind("member")),
on(hasType(qualType(
@@ -40,7 +40,7 @@
hasDescendant(substTemplateTypeParmType()))),
anyOf(TypesMatcher, pointerType(pointee(TypesMatcher)))))),
callee(namedDecl(hasName("data"))))
- .bind("call")))),
+ .bind("call"))),
this);
}
Index: clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.h
+++ clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.h
@@ -29,6 +29,10 @@
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
+
private:
void
checkRedundantReturn(const ast_matchers::MatchFinder::MatchResult &Result,
Index: clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/RedundantControlFlowCheck.cpp
@@ -32,10 +32,10 @@
void RedundantControlFlowCheck::registerMatchers(MatchFinder *Finder) {
Finder->addMatcher(
- functionDecl(
- isDefinition(), returns(voidType()),
- has(compoundStmt(hasAnySubstatement(returnStmt(unless(has(expr())))))
- .bind("return"))),
+ functionDecl(isDefinition(), returns(voidType()),
+ hasBody(compoundStmt(hasAnySubstatement(
+ returnStmt(unless(has(expr())))))
+ .bind("return"))),
this);
Finder->addMatcher(
mapAnyOf(forStmt, cxxForRangeStmt, whileStmt, doStmt)
Index: clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.h
+++ clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.h
@@ -26,6 +26,9 @@
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
void onEndOfTranslationUnit() override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
/// Parameter info.
Index: clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/NonConstParameterCheck.cpp
@@ -18,7 +18,7 @@
void NonConstParameterCheck::registerMatchers(MatchFinder *Finder) {
// Add parameters to Parameters.
- Finder->addMatcher(parmVarDecl(unless(isInstantiated())).bind("Parm"), this);
+ Finder->addMatcher(parmVarDecl().bind("Parm"), this);
// C++ constructor.
Finder->addMatcher(cxxConstructorDecl().bind("Ctor"), this);
@@ -28,13 +28,11 @@
Finder->addMatcher(declRefExpr().bind("Ref"), this);
// Analyse parameter usage in function.
- Finder->addMatcher(
- traverse(TK_AsIs,
- stmt(anyOf(unaryOperator(hasAnyOperatorName("++", "--")),
- binaryOperator(), callExpr(), returnStmt(),
- cxxConstructExpr()))
- .bind("Mark")),
- this);
+ Finder->addMatcher(stmt(anyOf(unaryOperator(hasAnyOperatorName("++", "--")),
+ binaryOperator(), callExpr(), returnStmt(),
+ cxxConstructExpr()))
+ .bind("Mark"),
+ this);
Finder->addMatcher(varDecl(hasInitializer(anything())).bind("Mark"), this);
}
Index: clang-tools-extra/clang-tidy/readability/NamedParameterCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/NamedParameterCheck.h
+++ clang-tools-extra/clang-tidy/readability/NamedParameterCheck.h
@@ -32,6 +32,9 @@
: ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
};
} // namespace readability
Index: clang-tools-extra/clang-tidy/readability/NamedParameterCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/NamedParameterCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/NamedParameterCheck.cpp
@@ -18,7 +18,7 @@
namespace readability {
void NamedParameterCheck::registerMatchers(ast_matchers::MatchFinder *Finder) {
- Finder->addMatcher(functionDecl(unless(isInstantiated())).bind("decl"), this);
+ Finder->addMatcher(functionDecl().bind("decl"), this);
}
void NamedParameterCheck::check(const MatchFinder::MatchResult &Result) {
@@ -26,10 +26,6 @@
const auto *Function = Result.Nodes.getNodeAs<FunctionDecl>("decl");
SmallVector<std::pair<const FunctionDecl *, unsigned>, 4> UnnamedParams;
- // Ignore implicitly generated members.
- if (Function->isImplicit())
- return;
-
// Ignore declarations without a definition if we're not dealing with an
// overriden method.
const FunctionDecl *Definition = nullptr;
Index: clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h
+++ clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.h
@@ -27,6 +27,9 @@
: ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
void danglingElseCheck(const SourceManager &SM, ASTContext *Context,
Index: clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/MisleadingIndentationCheck.cpp
@@ -106,11 +106,7 @@
}
void MisleadingIndentationCheck::registerMatchers(MatchFinder *Finder) {
- Finder->addMatcher(
- ifStmt(allOf(hasElse(stmt()),
- unless(allOf(isConstexpr(), isInTemplateInstantiation()))))
- .bind("if"),
- this);
+ Finder->addMatcher(ifStmt(hasElse(stmt())).bind("if"), this);
Finder->addMatcher(
compoundStmt(has(stmt(anyOf(ifStmt(), forStmt(), whileStmt()))))
.bind("compound"),
Index: clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
+++ clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
@@ -33,6 +33,9 @@
void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
void markRedeclarationsAsVisited(const FunctionDecl *FunctionDeclaration);
Index: clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp
@@ -294,8 +294,7 @@
void InconsistentDeclarationParameterNameCheck::registerMatchers(
MatchFinder *Finder) {
- Finder->addMatcher(functionDecl(unless(isImplicit()), hasOtherDeclarations())
- .bind("functionDecl"),
+ Finder->addMatcher(functionDecl(hasOtherDeclarations()).bind("functionDecl"),
this);
}
Index: clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.h
+++ clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.h
@@ -28,6 +28,9 @@
Preprocessor *ModuleExpanderPP) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
using ConditionalBranchMap =
llvm::DenseMap<FileID, SmallVector<SourceRange, 1>>;
Index: clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp
@@ -171,8 +171,7 @@
void ElseAfterReturnCheck::registerMatchers(MatchFinder *Finder) {
const auto InterruptsControlFlow = stmt(anyOf(
returnStmt().bind(InterruptingStr), continueStmt().bind(InterruptingStr),
- breakStmt().bind(InterruptingStr),
- expr(ignoringImplicit(cxxThrowExpr().bind(InterruptingStr)))));
+ breakStmt().bind(InterruptingStr), cxxThrowExpr().bind(InterruptingStr)));
Finder->addMatcher(
compoundStmt(
forEach(ifStmt(unless(isConstexpr()),
Index: clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h
+++ clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.h
@@ -55,6 +55,9 @@
template <typename IfOrWhileStmt>
SourceLocation findRParenLoc(const IfOrWhileStmt *S, const SourceManager &SM,
const ASTContext *Context);
+ llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
+ return TK_IgnoreUnlessSpelledInSource;
+ }
private:
std::set<const Stmt *> ForceBracesStmts;
Index: clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
+++ clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
@@ -105,10 +105,7 @@
}
void BracesAroundStatementsCheck::registerMatchers(MatchFinder *Finder) {
- Finder->addMatcher(
- ifStmt(unless(allOf(isConstexpr(), isInTemplateInstantiation())))
- .bind("if"),
- this);
+ Finder->addMatcher(ifStmt().bind("if"), this);
Finder->addMatcher(whileStmt().bind("while"), this);
Finder->addMatcher(doStmt().bind("do"), this);
Finder->addMatcher(forStmt().bind("for"), this);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
