From: Artem Belevich Date: Tue, 18 Sep 2018 21:51:02 +0000 (+0000) Subject: [clang-tidy] Replace redundant checks with an assert(). X-Git-Tag: llvmorg-8.0.0-rc1~8448 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcfcd508e433625c8b3b884d2e98c8c709667dbe;p=platform%2Fupstream%2Fllvm.git [clang-tidy] Replace redundant checks with an assert(). findStyleKind is only called if D is an explicit identifier with a name, so the checks for operators will never return true. The explicit assert() enforces this invariant. Differential Revision: https://reviews.llvm.org/D52179 llvm-svn: 342514 --- diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp index 90c34b3..e34fcbb 100644 --- a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp +++ b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp @@ -385,6 +385,9 @@ static StyleKind findStyleKind( const NamedDecl *D, const std::vector> &NamingStyles) { + assert(D && D->getIdentifier() && !D->getName().empty() && !D->isImplicit() && + "Decl must be an explicit identifier with a name."); + if (isa(D) && NamingStyles[SK_ObjcIvar]) return SK_ObjcIvar; @@ -548,8 +551,6 @@ static StyleKind findStyleKind( if (const auto *Decl = dyn_cast(D)) { if (Decl->isMain() || !Decl->isUserProvided() || - Decl->isUsualDeallocationFunction() || - Decl->isCopyAssignmentOperator() || Decl->isMoveAssignmentOperator() || Decl->size_overridden_methods() > 0) return SK_Invalid;