jroelofs updated this revision to Diff 248203. jroelofs added a comment. Split out https://reviews.llvm.org/D75621
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D74669/new/ https://reviews.llvm.org/D74669 Files: clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.h clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.cpp clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.hpp clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/c.c clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/c.cc clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/c.cxx clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp =================================================================== --- /dev/null +++ clang-tools-extra/test/clang-tidy/checkers/bugprone-suspicious-include.cpp @@ -0,0 +1,21 @@ +// RUN: %check_clang_tidy %s bugprone-suspicious-include %t -- -- -isystem %S/Inputs/Headers -fmodules + +// CHECK-MESSAGES: [[@LINE+4]]:11: warning: suspicious #include of file with '.cpp' extension +// CHECK-MESSAGES: [[@LINE+3]]:11: note: did you mean to include 'a'? +// CHECK-MESSAGES: [[@LINE+2]]:11: note: did you mean to include 'a.h'? +// CHECK-MESSAGES: [[@LINE+1]]:11: note: did you mean to include 'a.hpp'? +#include "a.cpp" + +#include "b.h" + +// CHECK-MESSAGES: [[@LINE+1]]:10: warning: suspicious #import of file with '.c' extension +#import "c.c" + +// CHECK-MESSAGES: [[@LINE+1]]:16: warning: suspicious #include_next of file with '.c' extension +#include_next <c.c> + +// CHECK-MESSAGES: [[@LINE+1]]:13: warning: suspicious #include of file with '.cc' extension +# include <c.cc> + +// CHECK-MESSAGES: [[@LINE+1]]:14: warning: suspicious #include of file with '.cxx' extension +# include <c.cxx> Index: clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h =================================================================== --- clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h +++ clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h @@ -11,6 +11,7 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" +#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallSet.h" #include "llvm/ADT/StringRef.h" @@ -36,10 +37,21 @@ /// extensions. inline StringRef defaultHeaderFileExtensions() { return ";h;hh;hpp;hxx"; } +/// Returns recommended default value for the list of implementaiton file +/// extensions. +inline StringRef defaultImplementationFileExtensions() { + return "c;cc;cpp;cxx"; +} + /// Parses header file extensions from a semicolon-separated list. bool parseFileExtensions(StringRef AllFileExtensions, FileExtensionsSet &FileExtensions, char Delimiter); +/// Decides whether a file has a header file extension. +/// Returns the file extension, if included in the provided set. +llvm::Optional<StringRef> +getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions); + /// Decides whether a file has one of the specified file extensions. bool isFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions); Index: clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp =================================================================== --- clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp +++ clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp @@ -46,13 +46,20 @@ return true; } -bool isFileExtension(StringRef FileName, - const FileExtensionsSet &FileExtensions) { +llvm::Optional<StringRef> +getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions) { StringRef Extension = llvm::sys::path::extension(FileName); if (Extension.empty()) - return false; + return llvm::None; // Skip "." prefix. - return FileExtensions.count(Extension.substr(1)) > 0; + if (!FileExtensions.count(Extension.substr(1))) + return llvm::None; + return Extension; +} + +bool isFileExtension(StringRef FileName, + const FileExtensionsSet &FileExtensions) { + return getFileExtension(FileName, FileExtensions).hasValue(); } } // namespace utils Index: clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.h =================================================================== --- /dev/null +++ clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.h @@ -0,0 +1,57 @@ +//===--- SuspiciousIncludeCheck.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_BUGPRONE_SUSPICIOUSINCLUDECHECK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_SUSPICIOUSINCLUDECHECK_H + +#include "../ClangTidyCheck.h" +#include "../utils/FileExtensionsUtils.h" + +namespace clang { +namespace tidy { +namespace bugprone { + +/// Warns on inclusion of files whose names suggest that they're implementation +/// files, instead of headers. E.g: +/// +/// #include "foo.cpp" // warning +/// #include "bar.c" // warning +/// #include "baz.h" // no diagnostic +/// +/// The check supports these options: +/// - `HeaderFileExtensions`: a semicolon-separated list of filename extensions +/// of implementation files (The filename extensions should not contain "." +/// prefix) "c;cc;cpp;cxx" by default. +/// +/// - `ImplementationFileExtensions`: likewise, a semicolon-separated list of +/// filename extensions of header files. ";h;hh;hpp;hxx" by default. For +/// extension-less header files, using an empty string or leaving an empty +/// string between ";" if there are other filename extensions. +/// +/// For the user-facing documentation see: +/// http://clang.llvm.org/extra/clang-tidy/checks/bugprone-suspicious-include.html +class SuspiciousIncludeCheck : public ClangTidyCheck { +public: + SuspiciousIncludeCheck(StringRef Name, ClangTidyContext *Context); + void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP, + Preprocessor *ModuleExpanderPP) override; + void storeOptions(ClangTidyOptions::OptionMap &Opts) override; + + utils::FileExtensionsSet HeaderFileExtensions; + utils::FileExtensionsSet ImplementationFileExtensions; + +private: + const std::string RawStringHeaderFileExtensions; + const std::string RawStringImplementationFileExtensions; +}; + +} // namespace bugprone +} // namespace tidy +} // namespace clang + +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_BUGPRONE_SUSPICIOUSINCLUDECHECK_H Index: clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp =================================================================== --- /dev/null +++ clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp @@ -0,0 +1,103 @@ +//===--- SuspiciousIncludeCheck.cpp - clang-tidy --------------------------===// +// +// 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 +// +//===----------------------------------------------------------------------===// + +#include "SuspiciousIncludeCheck.h" +#include "clang/AST/ASTContext.h" + +namespace clang { +namespace tidy { +namespace bugprone { + +namespace { +class SuspiciousIncludePPCallbacks : public PPCallbacks { +public: + explicit SuspiciousIncludePPCallbacks(SuspiciousIncludeCheck &Check, + const SourceManager &SM, + Preprocessor *PP) + : Check(Check), PP(PP) {} + + void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok, + StringRef FileName, bool IsAngled, + CharSourceRange FilenameRange, const FileEntry *File, + StringRef SearchPath, StringRef RelativePath, + const Module *Imported, + SrcMgr::CharacteristicKind FileType) override; + +private: + SuspiciousIncludeCheck &Check; + Preprocessor *PP; +}; +} // namespace + +SuspiciousIncludeCheck::SuspiciousIncludeCheck(StringRef Name, + ClangTidyContext *Context) + : ClangTidyCheck(Name, Context), + RawStringHeaderFileExtensions(Options.getLocalOrGlobal( + "HeaderFileExtensions", utils::defaultHeaderFileExtensions())), + RawStringImplementationFileExtensions(Options.getLocalOrGlobal( + "ImplementationFileExtensions", + utils::defaultImplementationFileExtensions())) { + if (!utils::parseFileExtensions(RawStringImplementationFileExtensions, + ImplementationFileExtensions, ';')) { + llvm::errs() << "Invalid implementation file extension: " + << RawStringImplementationFileExtensions << "\n"; + } + + if (!utils::parseFileExtensions(RawStringHeaderFileExtensions, + HeaderFileExtensions, ';')) { + llvm::errs() << "Invalid header file extension: " + << RawStringHeaderFileExtensions << "\n"; + } +} + +void SuspiciousIncludeCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { + Options.store(Opts, "ImplementationFileExtensions", + RawStringImplementationFileExtensions); + Options.store(Opts, "HeaderFileExtensions", RawStringHeaderFileExtensions); +} + +void SuspiciousIncludeCheck::registerPPCallbacks( + const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) { + PP->addPPCallbacks( + ::std::make_unique<SuspiciousIncludePPCallbacks>(*this, SM, PP)); +} + +void SuspiciousIncludePPCallbacks::InclusionDirective( + SourceLocation HashLoc, const Token &IncludeTok, StringRef FileName, + bool IsAngled, CharSourceRange FilenameRange, const FileEntry *File, + StringRef SearchPath, StringRef RelativePath, const Module *Imported, + SrcMgr::CharacteristicKind FileType) { + SourceLocation DiagLoc = FilenameRange.getBegin().getLocWithOffset(1); + + const Optional<StringRef> IFE = + utils::getFileExtension(FileName, Check.ImplementationFileExtensions); + if (!IFE) + return; + + Check.diag(DiagLoc, "suspicious #%0 of file with '%1' extension") + << IncludeTok.getIdentifierInfo()->getName() << *IFE; + + for (const auto &HFE : Check.HeaderFileExtensions) { + SmallString<128> GuessedFileName(FileName); + llvm::sys::path::replace_extension(GuessedFileName, + (HFE.size() ? "." : "") + HFE); + + const DirectoryLookup *CurDir; + Optional<FileEntryRef> File = + PP->LookupFile(DiagLoc, GuessedFileName, IsAngled, nullptr, nullptr, + CurDir, nullptr, nullptr, nullptr, nullptr, nullptr); + if (File) { + Check.diag(DiagLoc, "did you mean to include '%0'?", DiagnosticIDs::Note) + << GuessedFileName; + } + } +} + +} // namespace bugprone +} // namespace tidy +} // namespace clang Index: clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt +++ clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt @@ -37,6 +37,7 @@ StringIntegerAssignmentCheck.cpp StringLiteralWithEmbeddedNulCheck.cpp SuspiciousEnumUsageCheck.cpp + SuspiciousIncludeCheck.cpp SuspiciousMemsetUsageCheck.cpp SuspiciousMissingCommaCheck.cpp SuspiciousSemicolonCheck.cpp Index: clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp =================================================================== --- clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp +++ clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp @@ -45,6 +45,7 @@ #include "StringIntegerAssignmentCheck.h" #include "StringLiteralWithEmbeddedNulCheck.h" #include "SuspiciousEnumUsageCheck.h" +#include "SuspiciousIncludeCheck.h" #include "SuspiciousMemsetUsageCheck.h" #include "SuspiciousMissingCommaCheck.h" #include "SuspiciousSemicolonCheck.h" @@ -140,6 +141,8 @@ "bugprone-string-literal-with-embedded-nul"); CheckFactories.registerCheck<SuspiciousEnumUsageCheck>( "bugprone-suspicious-enum-usage"); + CheckFactories.registerCheck<SuspiciousIncludeCheck>( + "bugprone-suspicious-include"); CheckFactories.registerCheck<SuspiciousMemsetUsageCheck>( "bugprone-suspicious-memset-usage"); CheckFactories.registerCheck<SuspiciousMissingCommaCheck>(
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits