Merge pull request #56 from rianquinn/bsl-tidy

rianquinn · web-flow · commit 265a3df49bae · 2021-01-28T13:46:37.000-07:00
Bug Fixes
diff --git a/clang-tools-extra/clang-tidy/bsl/ClassMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/bsl/ClassMemberInitCheck.cpp
@@ -37,18 +37,23 @@ void ClassMemberInitCheck::checkCtorWithInit(const CXXConstructorDecl *Ctor)
   const auto Parent = Ctor->getParent()->getCanonicalDecl();
   auto NumFields = 0;
 
+  if (nullptr == Parent)
+    return;
+
   for (const auto Field : Parent->fields()) {
     ++NumFields;
 
     if (!Field->hasInClassInitializer())
       continue;
 
-    const auto Init = Field->getInClassInitializer();
-
     diag(Loc, "must use either in-class initializers for all fields"
         " or constructor initializers for all fields");
-    diag(Init->getBeginLoc(), "found in-class initializer here",
-        DiagnosticIDs::Note);
+
+    const auto Init = Field->getInClassInitializer();
+    if (nullptr != Init) {
+      diag(Init->getBeginLoc(), "found in-class initializer here",
+          DiagnosticIDs::Note);
+    }
 
     return;
   }
diff --git a/clang-tools-extra/clang-tidy/bsl/DeclForbiddenCheck.cpp b/clang-tools-extra/clang-tidy/bsl/DeclForbiddenCheck.cpp
@@ -36,12 +36,6 @@ void DeclForbiddenCheck::check(const MatchFinder::MatchResult &Result) {
     return;
   }
 
-  const auto BitField = dyn_cast<FieldDecl>(D);
-  if (BitField) {
-    diag(Loc, "bitfields are forbidden");
-    return;
-  }
-
   const auto Friend = dyn_cast<FriendDecl>(D);
   if (Friend) {
     const auto FriendLoc = Friend->getFriendLoc();
diff --git a/clang-tools-extra/clang-tidy/bsl/DocumentationCheck.cpp b/clang-tools-extra/clang-tidy/bsl/DocumentationCheck.cpp
@@ -6,14 +6,14 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "IsDefinedInATestFile.h"
+
 #include "DocumentationCheck.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/AST/Comment.h"
 #include "clang/AST/CommentCommandTraits.h"
 
-#include <iostream>
-
 using namespace clang::ast_matchers;
 
 namespace clang {
@@ -81,32 +81,6 @@ bool hasAReturn(
   return false;
 }
 
-bool isDefinedInATestFile(
-  ASTContext const * const Context, Decl const * const D)
-{
-  FullSourceLoc FullLocation = Context->getFullLoc(D->getBeginLoc());
-
-  auto const File = FullLocation.getFileEntry();
-  if (!File)
-    return false;
-
-  std::string filename{File->tryGetRealPathName()};
-
-  const size_t test_folder1 = filename.find("test/");
-  const size_t test_folder2 = filename.find("test\\");
-  const size_t test_folder3 = filename.find("tests/");
-  const size_t test_folder4 = filename.find("tests\\");
-  if (std::string::npos != test_folder1 ||
-      std::string::npos != test_folder2 ||
-      std::string::npos != test_folder3 ||
-      std::string::npos != test_folder4)
-  {
-    return true;
-  }
-
-  return false;
-}
-
 clang::comments::ParamCommandComment const * hasExtraParamCommandComment(
   clang::comments::FullComment const * const FC)
 {
@@ -195,7 +169,7 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   auto const *Context = Result.Context;
 
   if (auto const *FD = Result.Nodes.getNodeAs<FunctionDecl>("func-decl")) {
-    if (isDefinedInATestFile(Context, FD))
+    if (isDefinedInATestFile(Context, FD->getBeginLoc()))
       return;
 
     if (FD->getMemberSpecializationInfo())
@@ -204,13 +178,15 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
     if (FD->getTemplateSpecializationInfo())
       return;
 
+    if (auto const *CXXMD = dyn_cast<CXXMethodDecl>(FD)) {
+      if (CXXMD->getParent()->isLambda())
+        return;
+    }
+
     if (!hasABrief(Context, FD)) {
       diag(FD->getLocation(), "Function %0 is missing documentation. Are you missing the '@brief' command?") << FD;
     }
 
-    if (FD->isDeleted())
-      return;
-
     if (isa<CXXDeductionGuideDecl>(FD))
       return;
 
@@ -251,12 +227,15 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   }
 
   if (auto const *CXXRD = Result.Nodes.getNodeAs<CXXRecordDecl>("class-decl")) {
-    if (isDefinedInATestFile(Context, CXXRD))
+    if (isDefinedInATestFile(Context, CXXRD->getBeginLoc()))
       return;
 
     if (isa<ClassTemplateSpecializationDecl>(CXXRD))
       return;
 
+    if (CXXRD->isLambda())
+      return;
+
     if (CXXRD->getDefinition() != CXXRD)
       return;
 
@@ -292,7 +271,7 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   }
 
   if (auto const *VD = Result.Nodes.getNodeAs<VarDecl>("var-decl")) {
-    if (isDefinedInATestFile(Context, VD))
+    if (isDefinedInATestFile(Context, VD->getBeginLoc()))
       return;
 
     if (VD->getParentFunctionOrMethod())
@@ -309,7 +288,7 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   }
 
   if (auto const *FD = Result.Nodes.getNodeAs<FieldDecl>("field-decl")) {
-    if (isDefinedInATestFile(Context, FD))
+    if (isDefinedInATestFile(Context, FD->getBeginLoc()))
       return;
 
     if (!hasABrief(Context, FD)) {
@@ -320,7 +299,7 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   }
 
   if (auto const *TAD = Result.Nodes.getNodeAs<TypeAliasDecl>("alias-decl")) {
-    if (isDefinedInATestFile(Context, TAD))
+    if (isDefinedInATestFile(Context, TAD->getBeginLoc()))
       return;
 
     if (TAD->getParentFunctionOrMethod())
@@ -349,7 +328,7 @@ void DocumentationCheck::check(const MatchFinder::MatchResult &Result) {
   }
 
   if (auto const *ED = Result.Nodes.getNodeAs<EnumDecl>("enum-decl")) {
-    if (isDefinedInATestFile(Context, ED))
+    if (isDefinedInATestFile(Context, ED->getBeginLoc()))
       return;
 
     if (!hasABrief(Context, ED)) {
diff --git a/clang-tools-extra/clang-tidy/bsl/ElseRequiredAfterIfCheck.cpp b/clang-tools-extra/clang-tidy/bsl/ElseRequiredAfterIfCheck.cpp
@@ -6,12 +6,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "IsDefinedInATestFile.h"
+
 #include "ElseRequiredAfterIfCheck.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 
-#include <iostream>
-
 using namespace clang::ast_matchers;
 
 namespace clang {
@@ -91,15 +91,23 @@ void ElseRequiredAfterIfCheck::registerMatchers(MatchFinder *Finder) {
 }
 
 void ElseRequiredAfterIfCheck::check(const MatchFinder::MatchResult &Result) {
+  auto const *Context = Result.Context;
+
   const auto *IfMissingElse = Result.Nodes.getNodeAs<IfStmt>("if_missing_else");
   const auto *IfMissingElseNextLine = Result.Nodes.getNodeAs<IfStmt>("if_missing_else_next_line");
   const auto *UnneededElse = Result.Nodes.getNodeAs<Stmt>("unneeded_else");
 
   if (IfMissingElse) {
+    if (isDefinedInATestFile(Context, IfMissingElse->getIfLoc()))
+      return;
+
     diag(IfMissingElse->getIfLoc(), "'else' is required after 'if'");
   }
 
   if (IfMissingElseNextLine) {
+    if (isDefinedInATestFile(Context, IfMissingElseNextLine->getIfLoc()))
+      return;
+
     auto *Parent = Result.Nodes.getNodeAs<Stmt>("parent");
     for (auto Iter = Parent->child_begin(); Iter != Parent->child_end(); ++Iter) {
       auto next = Iter;
@@ -110,8 +118,15 @@ void ElseRequiredAfterIfCheck::check(const MatchFinder::MatchResult &Result) {
     }
   }
 
-  if (UnneededElse && UnneededElse->getBeginLoc().isValid())
+  if (UnneededElse) {
+    if (UnneededElse->getBeginLoc().isInvalid())
+      return;
+
+    if (isDefinedInATestFile(Context, UnneededElse->getBeginLoc()))
+      return;
+
     diag(UnneededElse->getBeginLoc(), "do not use 'else' after 'return/continue/break'");
+  }
 }
 
 } // namespace bsl
diff --git a/clang-tools-extra/clang-tidy/bsl/ImplicitConversionsForbiddenCheck.cpp b/clang-tools-extra/clang-tidy/bsl/ImplicitConversionsForbiddenCheck.cpp
@@ -42,7 +42,8 @@ void ImplicitConversionsForbiddenCheck::check(const MatchFinder::MatchResult &Re
       ICE->getCastKind() == CK_MemberPointerToBoolean ||
       ICE->getCastKind() == CK_PointerToBoolean ||
       ICE->getCastKind() == CK_ToVoid ||
-      ICE->getCastKind() == CK_BuiltinFnToFnPtr)
+      ICE->getCastKind() == CK_BuiltinFnToFnPtr ||
+      ICE->getCastKind() == CK_ConstructorConversion)
     return;
 
   // Decaying a C-Style string is ok so long as it is a literal.
diff --git a/clang-tools-extra/clang-tidy/bsl/IsDefinedInATestFile.h b/clang-tools-extra/clang-tidy/bsl/IsDefinedInATestFile.h
@@ -0,0 +1,56 @@
+//===--- IsInATestFile.h - clang-tidy ---------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BSL_ISINATESTFILE_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BSL_ISINATESTFILE_H
+
+#include "../ClangTidyCheck.h"
+
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/Comment.h"
+#include "clang/AST/CommentCommandTraits.h"
+
+namespace clang {
+namespace tidy {
+namespace bsl {
+
+inline bool isDefinedInATestFile(
+  ASTContext const * const Context, SourceLocation const Loc)
+{
+  FullSourceLoc FullLocation = Context->getFullLoc(Loc);
+
+  auto const File = FullLocation.getFileEntry();
+  if (!File)
+    return false;
+
+  std::string filename{File->tryGetRealPathName()};
+
+  const size_t in_clang_folder = filename.find("clang-tidy");
+  if (std::string::npos != in_clang_folder)
+    return false;
+
+  const size_t test_folder1 = filename.find("test/");
+  const size_t test_folder2 = filename.find("test\\");
+  const size_t test_folder3 = filename.find("tests/");
+  const size_t test_folder4 = filename.find("tests\\");
+  if (std::string::npos != test_folder1 ||
+      std::string::npos != test_folder2 ||
+      std::string::npos != test_folder3 ||
+      std::string::npos != test_folder4)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+}
+}
+}
+
+#endif
diff --git a/clang-tools-extra/clang-tidy/bsl/NonSafeIntegralTypesAreForbiddenCheck.cpp b/clang-tools-extra/clang-tidy/bsl/NonSafeIntegralTypesAreForbiddenCheck.cpp
@@ -32,6 +32,16 @@ void NonSafeIntegralTypesAreForbiddenCheck::check(const MatchFinder::MatchResult
     if (name == "char")
       return;
 
+    if (auto const *parent = VD->getParentFunctionOrMethod()) {
+      if (auto const *FD = dyn_cast<FunctionDecl>(parent)) {
+        if (FD->isExternC())
+          return;
+
+        if (FD->getNameAsString() == "main")
+          return;
+      }
+    }
+
     FullSourceLoc FullLocation = Result.Context->getFullLoc(VD->getBeginLoc());
     if (auto const File = FullLocation.getFileEntry()) {
       auto const filename{File->tryGetRealPathName()};
diff --git a/clang-tools-extra/clang-tidy/bsl/UserDefinedTypeNamesMatchHeaderNameCheck.cpp b/clang-tools-extra/clang-tidy/bsl/UserDefinedTypeNamesMatchHeaderNameCheck.cpp
@@ -38,6 +38,7 @@ void UserDefinedTypeNamesMatchHeaderNameCheck::check(const MatchFinder::MatchRes
   if (isa<NamespaceDecl>(D) ||
       isa<FunctionDecl>(D) ||
       isa<FunctionTemplateDecl>(D) ||
+      isa<TypeAliasDecl>(D) ||
       isa<VarDecl>(D) ||
       isa<VarTemplateDecl>(D) ||
       isa<FieldDecl>(D) ||
@@ -96,11 +97,6 @@ void UserDefinedTypeNamesMatchHeaderNameCheck::check(const MatchFinder::MatchRes
   if (name == filename)
     return;
 
-  if (isa<TypeAliasDecl>(D)) {
-    if (name == filename + "_t")
-      return;
-  }
-
   diag(D->getBeginLoc(), "User-defined types must have the same name as the header file they are "
                          "defined in. Either name the %0 '%1', or name the header '%2'")
                          << D->getDeclKindName() << filename << name;
diff --git a/clang-tools-extra/test/clang-tidy/bsl-tmp.cpp b/clang-tools-extra/test/clang-tidy/bsl-tmp.cpp
diff --git a/clang-tools-extra/test/clang-tidy/bsl-tmp.cpp.msg b/clang-tools-extra/test/clang-tidy/bsl-tmp.cpp.msg
