[clang-tidy] Fix ClangTidyDiagnosticConsumer

Author: zeyi2

clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp

@@ -239,13 +239,20 @@ static bool parseFileExtensions(llvm::ArrayRef<std::string> AllFileExtensions,
 void ClangTidyContext::setCurrentFile(StringRef File) {
   CurrentFile = std::string(File);
   CurrentOptions = getOptionsForFile(CurrentFile);
-  CheckFilter = std::make_unique<CachedGlobList>(*getOptions().Checks);
-  WarningAsErrorFilter =
-      std::make_unique<CachedGlobList>(*getOptions().WarningsAsErrors);
-  if (!parseFileExtensions(*getOptions().HeaderFileExtensions,
+  CheckFilter = std::make_unique<CachedGlobList>(
+      getOptions().Checks ? StringRef(*getOptions().Checks) : StringRef(""));
+  WarningAsErrorFilter = std::make_unique<CachedGlobList>(
+      getOptions().WarningsAsErrors ? StringRef(*getOptions().WarningsAsErrors)
+                                    : StringRef(""));
+  static const std::vector<std::string> EmptyFileExtensions;
+  if (!parseFileExtensions(getOptions().HeaderFileExtensions
+                               ? *getOptions().HeaderFileExtensions
+                               : EmptyFileExtensions,
                            HeaderFileExtensions))
     this->configurationDiag("Invalid header file extensions");
-  if (!parseFileExtensions(*getOptions().ImplementationFileExtensions,
+  if (!parseFileExtensions(getOptions().ImplementationFileExtensions
+                               ? *getOptions().ImplementationFileExtensions
+                               : EmptyFileExtensions,
                            ImplementationFileExtensions))
     this->configurationDiag("Invalid implementation file extensions");
 }
@@ -569,7 +576,7 @@ void ClangTidyDiagnosticConsumer::checkFilters(SourceLocation Location,
     return;
   }
 
-  if (!*Context.getOptions().SystemHeaders &&
+  if (!Context.getOptions().SystemHeaders.value_or(false) &&
       (Sources.isInSystemHeader(Location) || Sources.isInSystemMacro(Location)))
     return;
 
@@ -600,15 +607,19 @@ void ClangTidyDiagnosticConsumer::checkFilters(SourceLocation Location,
 
 llvm::Regex *ClangTidyDiagnosticConsumer::getHeaderFilter() {
   if (!HeaderFilter)
-    HeaderFilter =
-        std::make_unique<llvm::Regex>(*Context.getOptions().HeaderFilterRegex);
+    HeaderFilter = std::make_unique<llvm::Regex>(
+        Context.getOptions().HeaderFilterRegex
+            ? StringRef(*Context.getOptions().HeaderFilterRegex)
+            : StringRef(""));
   return HeaderFilter.get();
 }
 
 llvm::Regex *ClangTidyDiagnosticConsumer::getExcludeHeaderFilter() {
   if (!ExcludeHeaderFilter)
     ExcludeHeaderFilter = std::make_unique<llvm::Regex>(
-        *Context.getOptions().ExcludeHeaderFilterRegex);
+        Context.getOptions().ExcludeHeaderFilterRegex
+            ? StringRef(*Context.getOptions().ExcludeHeaderFilterRegex)
+            : StringRef(""));
   return ExcludeHeaderFilter.get();
 }
 

clang-tools-extra/clang-tidy/ClangTidyProfiling.cpp

@@ -57,6 +57,7 @@ void ClangTidyProfiling::printAsJSON(llvm::raw_ostream &OS,
 
 void ClangTidyProfiling::storeProfileData(llvm::TimerGroup &TG,
                                           const StorageParams &Storage) {
+  assert(this->Storage && "We should have a filename.");
   llvm::SmallString<256> OutputDirectory(Storage.StoreFilename);
   llvm::sys::path::remove_filename(OutputDirectory);
   if (const std::error_code EC =

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

@@ -132,7 +132,7 @@ void RedundantBranchConditionCheck::check(
 
     // If the other side has side effects then keep it.
     if (OtherSide && OtherSide->HasSideEffects(*Result.Context)) {
-      auto NextToken = Lexer::findNextToken(
+      const auto NextToken = Lexer::findNextToken(
           OtherSide->getEndLoc(), *Result.SourceManager, getLangOpts());
       if (NextToken) {
         const SourceLocation BeforeOtherSide =
@@ -167,7 +167,7 @@ void RedundantBranchConditionCheck::check(
       Diag << FixItHint::CreateRemoval(CharSourceRange::getTokenRange(
           CondOp->getLHS()->getBeginLoc(), BeforeRHS));
     } else {
-      auto NextToken = Lexer::findNextToken(
+      const auto NextToken = Lexer::findNextToken(
           CondOp->getLHS()->getEndLoc(), *Result.SourceManager, getLangOpts());
       if (NextToken) {
         const SourceLocation AfterLHS = NextToken->getLocation();