This is an archive of the discontinued LLVM Phabricator instance.

Differential D97151

[clang-tidy] Simplify redundant branch condition check
ClosedPublic

Authored by steveire on Feb 21 2021, 7:32 AM.

Details

Reviewers
aaron.ballman
njames93
Commits
rGa5feefa3c72e: [clang-tidy] Simplify redundant branch condition check

Diff Detail

Event Timeline

steveire created this revision.Feb 21 2021, 7:32 AM
Herald added a subscriber: xazax.hun. · View Herald TranscriptFeb 21 2021, 7:32 AM
steveire requested review of this revision.Feb 21 2021, 7:32 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 21 2021, 7:32 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B90130: Diff 325305.Feb 21 2021, 8:08 AM
njames93 accepted this revision.Feb 21 2021, 1:17 PM
This revision is now accepted and ready to land.Feb 21 2021, 1:17 PM
Closed by commit rGa5feefa3c72e: [clang-tidy] Simplify redundant branch condition check (authored by • stephenkelly). · Explain WhyFeb 27 2021, 4:15 AM
This revision was automatically updated to reflect the committed changes.
• stephenkelly added a commit: rGa5feefa3c72e: [clang-tidy] Simplify redundant branch condition check.

Revision Contents

PathSize
clang-tools-extra/
clang-tidy/
bugprone/
3 lines
28 lines

Diff 326894

clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.h

Show All 20 Lines
/// For the user-facing documentation see: /// For the user-facing documentation see:
/// http://clang.llvm.org/extra/clang-tidy/checks/bugprone-redundant-branch-condition.html /// http://clang.llvm.org/extra/clang-tidy/checks/bugprone-redundant-branch-condition.html
class RedundantBranchConditionCheck : public ClangTidyCheck { class RedundantBranchConditionCheck : public ClangTidyCheck {
public: public:
RedundantBranchConditionCheck(StringRef Name, ClangTidyContext *Context) RedundantBranchConditionCheck(StringRef Name, ClangTidyContext *Context)
: ClangTidyCheck(Name, Context) {} : ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override; void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
llvm::Optional<TraversalKind> getCheckTraversalKind() const override {
return TK_IgnoreUnlessSpelledInSource;
}
}; };
} // namespace bugprone } // namespace bugprone
} // namespace tidy } // namespace tidy
} // namespace clang } // namespace clang
#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_REDUNDANTBRANCHCONDITIONCHECK_H #endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_REDUNDANTBRANCHCONDITIONCHECK_H

clang-tools-extra/clang-tidy/bugprone/RedundantBranchConditionCheck.cpp

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
void RedundantBranchConditionCheck::registerMatchers(MatchFinder *Finder) { void RedundantBranchConditionCheck::registerMatchers(MatchFinder *Finder) {
const auto ImmutableVar = const auto ImmutableVar =
varDecl(anyOf(parmVarDecl(), hasLocalStorage()), hasType(isInteger()), varDecl(anyOf(parmVarDecl(), hasLocalStorage()), hasType(isInteger()),
unless(hasType(isVolatileQualified()))) unless(hasType(isVolatileQualified())))
.bind(CondVarStr); .bind(CondVarStr);
Finder->addMatcher( Finder->addMatcher(
ifStmt( ifStmt(
hasCondition(ignoringParenImpCasts(anyOf( hasCondition(anyOf(
declRefExpr(hasDeclaration(ImmutableVar)).bind(OuterIfVar1Str), declRefExpr(hasDeclaration(ImmutableVar)).bind(OuterIfVar1Str),
binaryOperator(hasOperatorName("&&"), binaryOperator(
hasEitherOperand(ignoringParenImpCasts( hasOperatorName("&&"),
declRefExpr(hasDeclaration(ImmutableVar)) hasEitherOperand(declRefExpr(hasDeclaration(ImmutableVar))
.bind(OuterIfVar2Str))))))), .bind(OuterIfVar2Str))))),
hasThen(hasDescendant( hasThen(hasDescendant(
ifStmt(hasCondition(ignoringParenImpCasts( ifStmt(hasCondition(anyOf(
anyOf(declRefExpr(hasDeclaration(varDecl( declRefExpr(hasDeclaration(
equalsBoundNode(CondVarStr)))) varDecl(equalsBoundNode(CondVarStr))))
.bind(InnerIfVar1Str), .bind(InnerIfVar1Str),
binaryOperator( binaryOperator(
hasAnyOperatorName("&&", "||"), hasAnyOperatorName("&&", "||"),
hasEitherOperand(ignoringParenImpCasts( hasEitherOperand(
declRefExpr(hasDeclaration(varDecl( declRefExpr(hasDeclaration(varDecl(
equalsBoundNode(CondVarStr)))) equalsBoundNode(CondVarStr))))
.bind(InnerIfVar2Str)))))))) .bind(InnerIfVar2Str))))))
.bind(InnerIfStr))), .bind(InnerIfStr))),
forFunction(functionDecl().bind(FuncStr))) forFunction(functionDecl().bind(FuncStr)))
.bind(OuterIfStr), .bind(OuterIfStr),
this); this);
// FIXME: Handle longer conjunctive and disjunctive clauses. // FIXME: Handle longer conjunctive and disjunctive clauses.
} }
void RedundantBranchConditionCheck::check(const MatchFinder::MatchResult &Result) { void RedundantBranchConditionCheck::check(const MatchFinder::MatchResult &Result) {
▲ Show 20 Lines • Show All 107 Lines • Show Last 20 Lines