diff options
9 files changed, 19 insertions, 25 deletions
diff --git a/clang-tools-extra/clang-move/ClangMove.h b/clang-tools-extra/clang-move/ClangMove.h index ddcb92abe60..945c6db0aaa 100644 --- a/clang-tools-extra/clang-move/ClangMove.h +++ b/clang-tools-extra/clang-move/ClangMove.h @@ -217,8 +217,8 @@ public: DeclarationReporter *const Reporter = nullptr) : Context(Context), Reporter(Reporter) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<ClangMoveAction>(Context, Reporter); + clang::FrontendAction *create() override { + return new ClangMoveAction(Context, Reporter); } private: diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index e21755226ea..a68111b4a95 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -527,9 +527,7 @@ void runClangTidy(clang::tidy::ClangTidyContext &Context, class ActionFactory : public FrontendActionFactory { public: ActionFactory(ClangTidyContext &Context) : ConsumerFactory(Context) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<Action>(&ConsumerFactory); - } + FrontendAction *create() override { return new Action(&ConsumerFactory); } private: class Action : public ASTFrontendAction { diff --git a/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp b/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp index bc6241df720..b4f7f0baeb8 100644 --- a/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp +++ b/clang-tools-extra/clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp @@ -53,7 +53,7 @@ class SymbolIndexActionFactory : public tooling::FrontendActionFactory { public: SymbolIndexActionFactory(tooling::ExecutionContext *Ctx) : Ctx(Ctx) {} - std::unique_ptr<clang::FrontendAction> create() override { + clang::FrontendAction *create() override { // Wraps the index action and reports collected symbols to the execution // context at the end of each translation unit. class WrappedIndexAction : public WrapperFrontendAction { @@ -102,8 +102,7 @@ public: auto Includes = llvm::make_unique<CanonicalIncludes>(); addSystemHeadersMapping(Includes.get()); CollectorOpts.Includes = Includes.get(); - - return llvm::make_unique<WrappedIndexAction>( + return new WrappedIndexAction( std::make_shared<SymbolCollector>(std::move(CollectorOpts)), std::move(Includes), IndexOpts, Ctx); } diff --git a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h b/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h index 0e109d58175..7be9fe2b2be 100644 --- a/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h +++ b/clang-tools-extra/include-fixer/find-all-symbols/FindAllSymbolsAction.h @@ -48,8 +48,8 @@ public: const HeaderMapCollector::RegexHeaderMap *RegexHeaderMap = nullptr) : Reporter(Reporter), RegexHeaderMap(RegexHeaderMap) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<FindAllSymbolsAction>(Reporter, RegexHeaderMap); + clang::FrontendAction *create() override { + return new FindAllSymbolsAction(Reporter, RegexHeaderMap); } private: diff --git a/clang-tools-extra/modularize/CoverageChecker.cpp b/clang-tools-extra/modularize/CoverageChecker.cpp index 3c406889c69..3687872871c 100644 --- a/clang-tools-extra/modularize/CoverageChecker.cpp +++ b/clang-tools-extra/modularize/CoverageChecker.cpp @@ -129,8 +129,8 @@ public: CoverageCheckerFrontendActionFactory(CoverageChecker &Checker) : Checker(Checker) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<CoverageCheckerAction>(Checker); + CoverageCheckerAction *create() override { + return new CoverageCheckerAction(Checker); } private: diff --git a/clang-tools-extra/modularize/Modularize.cpp b/clang-tools-extra/modularize/Modularize.cpp index 5512f929b7d..e5f19de88f9 100644 --- a/clang-tools-extra/modularize/Modularize.cpp +++ b/clang-tools-extra/modularize/Modularize.cpp @@ -722,9 +722,8 @@ public: : Entities(Entities), PPTracker(preprocessorTracker), HadErrors(HadErrors) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<CollectEntitiesAction>(Entities, PPTracker, - HadErrors); + CollectEntitiesAction *create() override { + return new CollectEntitiesAction(Entities, PPTracker, HadErrors); } private: @@ -803,8 +802,8 @@ class CompileCheckFrontendActionFactory : public FrontendActionFactory { public: CompileCheckFrontendActionFactory() {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<CompileCheckAction>(); + CompileCheckAction *create() override { + return new CompileCheckAction(); } }; diff --git a/clang-tools-extra/pp-trace/PPTrace.cpp b/clang-tools-extra/pp-trace/PPTrace.cpp index fdc121ae03f..d49bc20e7a6 100644 --- a/clang-tools-extra/pp-trace/PPTrace.cpp +++ b/clang-tools-extra/pp-trace/PPTrace.cpp @@ -139,8 +139,8 @@ public: std::vector<CallbackCall> &CallbackCalls) : Ignore(Ignore), CallbackCalls(CallbackCalls) {} - std::unique_ptr<clang::FrontendAction> create() override { - return llvm::make_unique<PPTraceAction>(Ignore, CallbackCalls); + PPTraceAction *create() override { + return new PPTraceAction(Ignore, CallbackCalls); } private: diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h index fc7302276ea..197c137fe86 100644 --- a/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h +++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyTest.h @@ -107,8 +107,7 @@ runCheckOnCode(StringRef Code, std::vector<ClangTidyError> *Errors = nullptr, SmallVector<std::unique_ptr<ClangTidyCheck>, 1> Checks; CheckFactory<CheckList...>::createChecks(&Context, Checks); tooling::ToolInvocation Invocation( - Args, llvm::make_unique<TestClangTidyAction>(Checks, Finder, Context), - Files.get()); + Args, new TestClangTidyAction(Checks, Finder, Context), Files.get()); InMemoryFileSystem->addFile(Filename, 0, llvm::MemoryBuffer::getMemBuffer(Code)); for (const auto &FileContent : PathsToContent) { diff --git a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp b/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp index a014c1e72ca..27cf6308100 100644 --- a/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp +++ b/clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp @@ -69,7 +69,7 @@ public: CommentHandler *PragmaHandler) : COpts(std::move(COpts)), PragmaHandler(PragmaHandler) {} - std::unique_ptr<clang::FrontendAction> create() override { + clang::FrontendAction *create() override { class WrappedIndexAction : public WrapperFrontendAction { public: WrappedIndexAction(std::shared_ptr<SymbolCollector> C, @@ -95,9 +95,8 @@ public: index::IndexingOptions::SystemSymbolFilterKind::All; IndexOpts.IndexFunctionLocals = false; Collector = std::make_shared<SymbolCollector>(COpts); - - return llvm::make_unique<WrappedIndexAction>( - Collector, std::move(IndexOpts), PragmaHandler); + return new WrappedIndexAction(Collector, std::move(IndexOpts), + PragmaHandler); } std::shared_ptr<SymbolCollector> Collector; |
