Author: ymandel Date: Wed Jun 26 08:04:33 2019 New Revision: 364435 URL: http://llvm.org/viewvc/llvm-project?rev=364435&view=rev Log: [clang-tidy] Fix ClangTidyTest to initialize context before checks.
Summary: Currently, `clang::tidy::test::runCheckOnCode()` constructs the check instances *before* initializing the ClangTidyContext. This ordering causes problems when the check's constructor accesses the context, for example, through `getLangOpts()`. This revision moves the construction to after the context initialization, which follows the pattern used in the clang tidy tool itself. Reviewers: gribozavr Subscribers: xazax.hun, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D63784 Modified: clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h Modified: clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h?rev=364435&r1=364434&r2=364435&view=diff ============================================================================== --- clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h (original) +++ clang-tools-extra/trunk/unittests/clang-tidy/ClangTidyTest.h Wed Jun 26 08:04:33 2019 @@ -27,6 +27,25 @@ namespace clang { namespace tidy { namespace test { +template <typename Check, typename... Checks> struct CheckFactory { + static void + createChecks(ClangTidyContext *Context, + SmallVectorImpl<std::unique_ptr<ClangTidyCheck>> &Result) { + CheckFactory<Check>::createChecks(Context, Result); + CheckFactory<Checks...>::createChecks(Context, Result); + } +}; + +template <typename Check> struct CheckFactory<Check> { + static void + createChecks(ClangTidyContext *Context, + SmallVectorImpl<std::unique_ptr<ClangTidyCheck>> &Result) { + Result.emplace_back(llvm::make_unique<Check>( + "test-check-" + std::to_string(Result.size()), Context)); + } +}; + +template <typename... CheckTypes> class TestClangTidyAction : public ASTFrontendAction { public: TestClangTidyAction(SmallVectorImpl<std::unique_ptr<ClangTidyCheck>> &Checks, @@ -42,6 +61,11 @@ private: Context.setASTContext(&Compiler.getASTContext()); Preprocessor *PP = &Compiler.getPreprocessor(); + + // Checks must be created here, _after_ `Context` has been initialized, so + // that check constructors can access the context (for example, through + // `getLangOpts()`). + CheckFactory<CheckTypes...>::createChecks(&Context, Checks); for (auto &Check : Checks) { Check->registerMatchers(&Finder); Check->registerPPCallbacks(Compiler.getSourceManager(), PP, PP); @@ -54,25 +78,7 @@ private: ClangTidyContext &Context; }; -template <typename Check, typename... Checks> struct CheckFactory { - static void - createChecks(ClangTidyContext *Context, - SmallVectorImpl<std::unique_ptr<ClangTidyCheck>> &Result) { - CheckFactory<Check>::createChecks(Context, Result); - CheckFactory<Checks...>::createChecks(Context, Result); - } -}; - -template <typename Check> struct CheckFactory<Check> { - static void - createChecks(ClangTidyContext *Context, - SmallVectorImpl<std::unique_ptr<ClangTidyCheck>> &Result) { - Result.emplace_back(llvm::make_unique<Check>( - "test-check-" + std::to_string(Result.size()), Context)); - } -}; - -template <typename... CheckList> +template <typename... CheckTypes> std::string runCheckOnCode(StringRef Code, std::vector<ClangTidyError> *Errors = nullptr, const Twine &Filename = "input.cc", @@ -110,9 +116,9 @@ runCheckOnCode(StringRef Code, std::vect new FileManager(FileSystemOptions(), InMemoryFileSystem)); SmallVector<std::unique_ptr<ClangTidyCheck>, 1> Checks; - CheckFactory<CheckList...>::createChecks(&Context, Checks); tooling::ToolInvocation Invocation( - Args, new TestClangTidyAction(Checks, Finder, Context), Files.get()); + Args, new TestClangTidyAction<CheckTypes...>(Checks, Finder, Context), + Files.get()); InMemoryFileSystem->addFile(Filename, 0, llvm::MemoryBuffer::getMemBuffer(Code)); for (const auto &FileContent : PathsToContent) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
