summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Belevich <tra@google.com>2018-09-18 21:51:02 +0000
committerArtem Belevich <tra@google.com>2018-09-18 21:51:02 +0000
commitfcfcd508e433625c8b3b884d2e98c8c709667dbe (patch)
tree4ba0f38d6fee5794684ebd63ebb42083210967d5
parentaaf4e2cbbabfe8f97925665b49d885aa0e5b703a (diff)
downloadbcm5719-llvm-fcfcd508e433625c8b3b884d2e98c8c709667dbe.tar.gz
bcm5719-llvm-fcfcd508e433625c8b3b884d2e98c8c709667dbe.zip
[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
-rw-r--r--clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
index 90c34b3724a..e34fcbb3a15 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<llvm::Optional<IdentifierNamingCheck::NamingStyle>>
&NamingStyles) {
+ assert(D && D->getIdentifier() && !D->getName().empty() && !D->isImplicit() &&
+ "Decl must be an explicit identifier with a name.");
+
if (isa<ObjCIvarDecl>(D) && NamingStyles[SK_ObjcIvar])
return SK_ObjcIvar;
@@ -548,8 +551,6 @@ static StyleKind findStyleKind(
if (const auto *Decl = dyn_cast<CXXMethodDecl>(D)) {
if (Decl->isMain() || !Decl->isUserProvided() ||
- Decl->isUsualDeallocationFunction() ||
- Decl->isCopyAssignmentOperator() || Decl->isMoveAssignmentOperator() ||
Decl->size_overridden_methods() > 0)
return SK_Invalid;
OpenPOWER on IntegriCloud