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
diff --git a/clang-doc/ClangDoc.cpp b/clang-doc/ClangDoc.cpp
index 261139b..da4165a 100644
--- a/clang-doc/ClangDoc.cpp
+++ b/clang-doc/ClangDoc.cpp
@@ -29,13 +29,13 @@
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 @@
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 ccffa4b..1a8b99a 100644
--- a/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h
+++ b/clang-include-fixer/find-all-symbols/FindAllSymbolsAction.h
@@ -47,8 +47,8 @@
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 da4bc44..ea241bb 100644
--- a/clang-move/Move.h
+++ b/clang-move/Move.h
@@ -224,8 +224,8 @@
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 dd5c35e..73933e3 100644
--- a/clang-tidy/ClangTidy.cpp
+++ b/clang-tidy/ClangTidy.cpp
@@ -530,7 +530,9 @@
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 97d8d12..dac0383 100644
--- a/clangd/indexer/IndexerMain.cpp
+++ b/clangd/indexer/IndexerMain.cpp
@@ -39,37 +39,36 @@
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 a9248e1..aa5bc77 100644
--- a/clangd/unittests/SymbolCollectorTests.cpp
+++ b/clangd/unittests/SymbolCollectorTests.cpp
@@ -200,7 +200,7 @@
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 @@
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 af257ab..6cfeb0e 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 @@
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 8d33310..e4bbb04 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 @@
: 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 @@
public:
CompileCheckFrontendActionFactory() {}
- CompileCheckAction *create() override {
- return new CompileCheckAction();
+ std::unique_ptr<FrontendAction> create() override {
+ return std::make_unique<CompileCheckAction>();
}
};
@@ -886,6 +888,7 @@
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 fcc811c..f91b019 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 @@
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;
