diff options
| -rw-r--r-- | clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h index 560b0ff893c..d1180d4ebfd 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h @@ -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::vector<ClangTidyError> *Errors = nullptr, 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) { |
