diff options
author | Dmitri Gribenko <gribozavr@gmail.com> | 2019-08-29 16:38:36 +0000 |
---|---|---|
committer | Dmitri Gribenko <gribozavr@gmail.com> | 2019-08-29 16:38:36 +0000 |
commit | 93d6caa1f59291afec72bbf43fb9dae1e7a43345 (patch) | |
tree | c9ef5973ab5194595c7a3a8c6cb2c68beccfbb00 | |
parent | 9760f9cf67c4a87fe15f6406486ef25d375b5687 (diff) |
Changed FrontendActionFactory::create to return a std::unique_ptr
Subscribers: jkorous, arphaman, kadircet, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D66947
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@370379 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | clang-doc/ClangDoc.cpp | 6 | ||||
-rw-r--r-- | clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h | 4 | ||||
-rw-r--r-- | clang-move/Move.h | 4 | ||||
-rw-r--r-- | clang-tidy/ClangTidy.cpp | 4 | ||||
-rw-r--r-- | clangd/indexer/IndexerMain.cpp | 55 | ||||
-rw-r--r-- | clangd/unittests/SymbolCollectorTests.cpp | 5 | ||||
-rw-r--r-- | modularize/CoverageChecker.cpp | 5 | ||||
-rw-r--r-- | modularize/Modularize.cpp | 11 | ||||
-rw-r--r-- | pp-trace/PPTrace.cpp | 5 |
9 files changed, 54 insertions, 45 deletions
diff --git a/clang-doc/ClangDoc.cpp b/clang-doc/ClangDoc.cpp index 261139bc..da4165a1 100644 --- a/clang-doc/ClangDoc.cpp +++ b/clang-doc/ClangDoc.cpp @@ -29,13 +29,13 @@ namespace doc { class MapperActionFactory : public tooling::FrontendActionFactory { public: MapperActionFactory(ClangDocContext CDCtx) : CDCtx(CDCtx) {} - clang::FrontendAction *create() override; + std::unique_ptr<FrontendAction> create() override; private: ClangDocContext CDCtx; }; -clang::FrontendAction *MapperActionFactory::create() { +std::unique_ptr<FrontendAction> MapperActionFactory::create() { class ClangDocAction : public clang::ASTFrontendAction { public: ClangDocAction(ClangDocContext CDCtx) : CDCtx(CDCtx) {} @@ -49,7 +49,7 @@ clang::FrontendAction *MapperActionFactory::create() { private: ClangDocContext CDCtx; }; - return new ClangDocAction(CDCtx); + return std::make_unique<ClangDocAction>(CDCtx); } std::unique_ptr<tooling::FrontendActionFactory> diff --git a/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h b/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h index ccffa4b3..1a8b99a3 100644 --- a/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h +++ b/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h @@ -47,8 +47,8 @@ public: const HeaderMapCollector::RegexHeaderMap *RegexHeaderMap = nullptr) : Reporter(Reporter), RegexHeaderMap(RegexHeaderMap) {} - clang::FrontendAction *create() override { - return new FindAllSymbolsAction(Reporter, RegexHeaderMap); + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<FindAllSymbolsAction>(Reporter, RegexHeaderMap); } private: diff --git a/clang-move/Move.h b/clang-move/Move.h index da4bc444..ea241bbb 100644 --- a/clang-move/Move.h +++ b/clang-move/Move.h @@ -224,8 +224,8 @@ public: DeclarationReporter *const Reporter = nullptr) : Context(Context), Reporter(Reporter) {} - clang::FrontendAction *create() override { - return new ClangMoveAction(Context, Reporter); + std::unique_ptr<clang::FrontendAction> create() override { + return std::make_unique<ClangMoveAction>(Context, Reporter); } private: diff --git a/clang-tidy/ClangTidy.cpp b/clang-tidy/ClangTidy.cpp index dd5c35e7..73933e3f 100644 --- a/clang-tidy/ClangTidy.cpp +++ b/clang-tidy/ClangTidy.cpp @@ -530,7 +530,9 @@ runClangTidy(clang::tidy::ClangTidyContext &Context, ActionFactory(ClangTidyContext &Context, IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> BaseFS) : ConsumerFactory(Context, BaseFS) {} - FrontendAction *create() override { return new Action(&ConsumerFactory); } + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<Action>(&ConsumerFactory); + } bool runInvocation(std::shared_ptr<CompilerInvocation> Invocation, FileManager *Files, diff --git a/clangd/indexer/IndexerMain.cpp b/clangd/indexer/IndexerMain.cpp index 97d8d128..dac03830 100644 --- a/clangd/indexer/IndexerMain.cpp +++ b/clangd/indexer/IndexerMain.cpp @@ -39,37 +39,36 @@ class IndexActionFactory : public tooling::FrontendActionFactory { public: IndexActionFactory(IndexFileIn &Result) : Result(Result) {} - clang::FrontendAction *create() override { + std::unique_ptr<FrontendAction> create() override { SymbolCollector::Options Opts; Opts.CountReferences = true; return createStaticIndexingAction( - Opts, - [&](SymbolSlab S) { - // Merge as we go. - std::lock_guard<std::mutex> Lock(SymbolsMu); - for (const auto &Sym : S) { - if (const auto *Existing = Symbols.find(Sym.ID)) - Symbols.insert(mergeSymbol(*Existing, Sym)); - else - Symbols.insert(Sym); - } - }, - [&](RefSlab S) { - std::lock_guard<std::mutex> Lock(SymbolsMu); - for (const auto &Sym : S) { - // Deduplication happens during insertion. - for (const auto &Ref : Sym.second) - Refs.insert(Sym.first, Ref); - } - }, - [&](RelationSlab S) { - std::lock_guard<std::mutex> Lock(SymbolsMu); - for (const auto &R : S) { - Relations.insert(R); - } - }, - /*IncludeGraphCallback=*/nullptr) - .release(); + Opts, + [&](SymbolSlab S) { + // Merge as we go. + std::lock_guard<std::mutex> Lock(SymbolsMu); + for (const auto &Sym : S) { + if (const auto *Existing = Symbols.find(Sym.ID)) + Symbols.insert(mergeSymbol(*Existing, Sym)); + else + Symbols.insert(Sym); + } + }, + [&](RefSlab S) { + std::lock_guard<std::mutex> Lock(SymbolsMu); + for (const auto &Sym : S) { + // Deduplication happens during insertion. + for (const auto &Ref : Sym.second) + Refs.insert(Sym.first, Ref); + } + }, + [&](RelationSlab S) { + std::lock_guard<std::mutex> Lock(SymbolsMu); + for (const auto &R : S) { + Relations.insert(R); + } + }, + /*IncludeGraphCallback=*/nullptr); } // Awkward: we write the result in the destructor, because the executor diff --git a/clangd/unittests/SymbolCollectorTests.cpp b/clangd/unittests/SymbolCollectorTests.cpp index a9248e1c..aa5bc77b 100644 --- a/clangd/unittests/SymbolCollectorTests.cpp +++ b/clangd/unittests/SymbolCollectorTests.cpp @@ -200,7 +200,7 @@ public: CommentHandler *PragmaHandler) : COpts(std::move(COpts)), PragmaHandler(PragmaHandler) {} - clang::FrontendAction *create() override { + std::unique_ptr<FrontendAction> create() override { class IndexAction : public ASTFrontendAction { public: IndexAction(std::shared_ptr<index::IndexDataConsumer> DataConsumer, @@ -232,7 +232,8 @@ public: index::IndexingOptions::SystemSymbolFilterKind::All; IndexOpts.IndexFunctionLocals = false; Collector = std::make_shared<SymbolCollector>(COpts); - return new IndexAction(Collector, std::move(IndexOpts), PragmaHandler); + return std::make_unique<IndexAction>(Collector, std::move(IndexOpts), + PragmaHandler); } std::shared_ptr<SymbolCollector> Collector; diff --git a/modularize/CoverageChecker.cpp b/modularize/CoverageChecker.cpp index af257abb..6cfeb0e2 100644 --- a/modularize/CoverageChecker.cpp +++ b/modularize/CoverageChecker.cpp @@ -58,6 +58,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/FrontendActions.h" #include "clang/Lex/PPCallbacks.h" #include "clang/Lex/Preprocessor.h" @@ -129,8 +130,8 @@ public: CoverageCheckerFrontendActionFactory(CoverageChecker &Checker) : Checker(Checker) {} - CoverageCheckerAction *create() override { - return new CoverageCheckerAction(Checker); + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<CoverageCheckerAction>(Checker); } private: diff --git a/modularize/Modularize.cpp b/modularize/Modularize.cpp index 8d333103..e4bbb04d 100644 --- a/modularize/Modularize.cpp +++ b/modularize/Modularize.cpp @@ -233,6 +233,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/FrontendActions.h" #include "clang/Lex/Preprocessor.h" #include "clang/Tooling/CompilationDatabase.h" @@ -721,8 +722,9 @@ public: : Entities(Entities), PPTracker(preprocessorTracker), HadErrors(HadErrors) {} - CollectEntitiesAction *create() override { - return new CollectEntitiesAction(Entities, PPTracker, HadErrors); + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<CollectEntitiesAction>(Entities, PPTracker, + HadErrors); } private: @@ -801,8 +803,8 @@ class CompileCheckFrontendActionFactory : public FrontendActionFactory { public: CompileCheckFrontendActionFactory() {} - CompileCheckAction *create() override { - return new CompileCheckAction(); + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<CompileCheckAction>(); } }; @@ -886,6 +888,7 @@ int main(int Argc, const char **Argv) { CompileCheckTool.appendArgumentsAdjuster( getModularizeArgumentsAdjuster(ModUtil->Dependencies)); int CompileCheckFileErrors = 0; + // FIXME: use newFrontendActionFactory. CompileCheckFrontendActionFactory CompileCheckFactory; CompileCheckFileErrors |= CompileCheckTool.run(&CompileCheckFactory); if (CompileCheckFileErrors != 0) { diff --git a/pp-trace/PPTrace.cpp b/pp-trace/PPTrace.cpp index fcc811c5..f91b0196 100644 --- a/pp-trace/PPTrace.cpp +++ b/pp-trace/PPTrace.cpp @@ -30,6 +30,7 @@ #include "clang/Basic/SourceManager.h" #include "clang/Driver/Options.h" #include "clang/Frontend/CompilerInstance.h" +#include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/FrontendActions.h" #include "clang/Lex/Preprocessor.h" #include "clang/Tooling/Execution.h" @@ -112,7 +113,9 @@ public: PPTraceFrontendActionFactory(const FilterType &Filters, raw_ostream &OS) : Filters(Filters), OS(OS) {} - PPTraceAction *create() override { return new PPTraceAction(Filters, OS); } + std::unique_ptr<FrontendAction> create() override { + return std::make_unique<PPTraceAction>(Filters, OS); + } private: const FilterType &Filters; |