Skip to content

Commit 497fd98

Browse files
LebedevRILebedevRI
committed
Revert "[Tooling] [0/1] Refactor FrontendActionFactory::create() to return std::unique_ptr<>"
This reverts commit rL326201 This broke gcc4.8 builds, compiler just segfaults:¬ http://lab.llvm.org:8011/builders/clang-atom-d525-fedora-rel/builds/14909¬ http://lab.llvm.org:8011/builders/clang-x86_64-linux-abi-test/builds/22673¬ llvm-svn: 326204
1 parent 12b4074 commit 497fd98

File tree

14 files changed

+108
-120
lines changed

14 files changed

+108
-120
lines changed

‎clang/docs/LibTooling.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ looked for. Let me give you an example:
3434
TEST(runToolOnCode, CanSyntaxCheckCode) {
3535
// runToolOnCode returns whether the action was correctly run over the
3636
// given code.
37-
EXPECT_TRUE(runToolOnCode(llvm::make_unique<clang::SyntaxOnlyAction>(), "class X {};"));
37+
EXPECT_TRUE(runToolOnCode(new clang::SyntaxOnlyAction, "class X {};"));
3838
}
3939

4040
Writing a standalone tool

‎clang/docs/RAVFrontendAction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Now we can combine all of the above into a small example program:
196196

197197
int main(int argc, char **argv) {
198198
if (argc > 1) {
199-
clang::tooling::runToolOnCode(llvm::make_unique<FindNamedClassAction>(), argv[1]);
199+
clang::tooling::runToolOnCode(new FindNamedClassAction, argv[1]);
200200
}
201201
}
202202

‎clang/include/clang/Tooling/Tooling.h‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class FrontendActionFactory : public ToolAction {
9494
/// \brief Returns a new clang::FrontendAction.
9595
///
9696
/// The caller takes ownership of the returned action.
97-
virtual std::unique_ptr<clang::FrontendAction> create() = 0;
97+
virtual clang::FrontendAction *create() = 0;
9898
};
9999

100100
/// \brief Returns a new FrontendActionFactory for a given type.
@@ -149,8 +149,8 @@ inline std::unique_ptr<FrontendActionFactory> newFrontendActionFactory(
149149
/// clang modules.
150150
///
151151
/// \return - True if 'ToolAction' was successfully executed.
152-
bool runToolOnCode(std::unique_ptr<FrontendAction> ToolAction,
153-
const Twine &Code, const Twine &FileName = "input.cc",
152+
bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
153+
const Twine &FileName = "input.cc",
154154
std::shared_ptr<PCHContainerOperations> PCHContainerOps =
155155
std::make_shared<PCHContainerOperations>());
156156

@@ -172,7 +172,7 @@ typedef std::vector<std::pair<std::string, std::string>> FileContentMappings;
172172
///
173173
/// \return - True if 'ToolAction' was successfully executed.
174174
bool runToolOnCodeWithArgs(
175-
std::unique_ptr<FrontendAction> ToolAction, const Twine &Code,
175+
clang::FrontendAction *ToolAction, const Twine &Code,
176176
const std::vector<std::string> &Args, const Twine &FileName = "input.cc",
177177
const Twine &ToolName = "clang-tool",
178178
std::shared_ptr<PCHContainerOperations> PCHContainerOps =
@@ -226,8 +226,8 @@ class ToolInvocation {
226226
/// ownership.
227227
/// \param PCHContainerOps The PCHContainerOperations for loading and creating
228228
/// clang modules.
229-
ToolInvocation(std::vector<std::string> CommandLine,
230-
std::unique_ptr<FrontendAction> FAction, FileManager *Files,
229+
ToolInvocation(std::vector<std::string> CommandLine, FrontendAction *FAction,
230+
FileManager *Files,
231231
std::shared_ptr<PCHContainerOperations> PCHContainerOps =
232232
std::make_shared<PCHContainerOperations>());
233233

@@ -367,9 +367,7 @@ template <typename T>
367367
std::unique_ptr<FrontendActionFactory> newFrontendActionFactory() {
368368
class SimpleFrontendActionFactory : public FrontendActionFactory {
369369
public:
370-
std::unique_ptr<clang::FrontendAction> create() override {
371-
return llvm::make_unique<T>();
372-
}
370+
clang::FrontendAction *create() override { return new T; }
373371
};
374372

375373
return std::unique_ptr<FrontendActionFactory>(
@@ -385,9 +383,8 @@ inline std::unique_ptr<FrontendActionFactory> newFrontendActionFactory(
385383
SourceFileCallbacks *Callbacks)
386384
: ConsumerFactory(ConsumerFactory), Callbacks(Callbacks) {}
387385

388-
std::unique_ptr<clang::FrontendAction> create() override {
389-
return llvm::make_unique<ConsumerFactoryAdaptor>(ConsumerFactory,
390-
Callbacks);
386+
clang::FrontendAction *create() override {
387+
return new ConsumerFactoryAdaptor(ConsumerFactory, Callbacks);
391388
}
392389

393390
private:

‎clang/lib/Tooling/Tooling.cpp‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ clang::CompilerInvocation *newInvocation(
104104
return Invocation;
105105
}
106106

107-
bool runToolOnCode(std::unique_ptr<FrontendAction> ToolAction,
108-
const Twine &Code, const Twine &FileName,
107+
bool runToolOnCode(clang::FrontendAction *ToolAction, const Twine &Code,
108+
const Twine &FileName,
109109
std::shared_ptr<PCHContainerOperations> PCHContainerOps) {
110-
return runToolOnCodeWithArgs(std::move(ToolAction), Code,
111-
std::vector<std::string>(), FileName,
112-
"clang-tool", std::move(PCHContainerOps));
110+
return runToolOnCodeWithArgs(ToolAction, Code, std::vector<std::string>(),
111+
FileName, "clang-tool",
112+
std::move(PCHContainerOps));
113113
}
114114

115115
static std::vector<std::string>
@@ -125,7 +125,7 @@ getSyntaxOnlyToolArgs(const Twine &ToolName,
125125
}
126126

127127
bool runToolOnCodeWithArgs(
128-
std::unique_ptr<FrontendAction> ToolAction, const Twine &Code,
128+
clang::FrontendAction *ToolAction, const Twine &Code,
129129
const std::vector<std::string> &Args, const Twine &FileName,
130130
const Twine &ToolName,
131131
std::shared_ptr<PCHContainerOperations> PCHContainerOps,
@@ -143,7 +143,8 @@ bool runToolOnCodeWithArgs(
143143
ArgumentsAdjuster Adjuster = getClangStripDependencyFileAdjuster();
144144
ToolInvocation Invocation(
145145
getSyntaxOnlyToolArgs(ToolName, Adjuster(Args, FileNameRef), FileNameRef),
146-
std::move(ToolAction), Files.get(), std::move(PCHContainerOps));
146+
ToolAction, Files.get(),
147+
std::move(PCHContainerOps));
147148

148149
SmallString<1024> CodeStorage;
149150
InMemoryFileSystem->addFile(FileNameRef, 0,
@@ -203,18 +204,15 @@ void addTargetAndModeForProgramName(std::vector<std::string> &CommandLine,
203204
namespace {
204205

205206
class SingleFrontendActionFactory : public FrontendActionFactory {
206-
std::unique_ptr<clang::FrontendAction> Action;
207+
FrontendAction *Action;
207208

208209
public:
209-
SingleFrontendActionFactory(std::unique_ptr<clang::FrontendAction> Action)
210-
: Action(std::move(Action)) {}
210+
SingleFrontendActionFactory(FrontendAction *Action) : Action(Action) {}
211211

212-
std::unique_ptr<clang::FrontendAction> create() override {
213-
return std::move(Action);
214-
}
212+
FrontendAction *create() override { return Action; }
215213
};
216214

217-
} // namespace
215+
}
218216

219217
ToolInvocation::ToolInvocation(
220218
std::vector<std::string> CommandLine, ToolAction *Action,
@@ -224,13 +222,12 @@ ToolInvocation::ToolInvocation(
224222
DiagConsumer(nullptr) {}
225223

226224
ToolInvocation::ToolInvocation(
227-
std::vector<std::string> CommandLine,
228-
std::unique_ptr<FrontendAction> FAction, FileManager *Files,
229-
std::shared_ptr<PCHContainerOperations> PCHContainerOps)
225+
std::vector<std::string> CommandLine, FrontendAction *FAction,
226+
FileManager *Files, std::shared_ptr<PCHContainerOperations> PCHContainerOps)
230227
: CommandLine(std::move(CommandLine)),
231-
Action(new SingleFrontendActionFactory(std::move(FAction))),
232-
OwnsAction(true), Files(Files),
233-
PCHContainerOps(std::move(PCHContainerOps)), DiagConsumer(nullptr) {}
228+
Action(new SingleFrontendActionFactory(FAction)), OwnsAction(true),
229+
Files(Files), PCHContainerOps(std::move(PCHContainerOps)),
230+
DiagConsumer(nullptr) {}
234231

235232
ToolInvocation::~ToolInvocation() {
236233
if (OwnsAction)

‎clang/tools/clang-refactor/ClangRefactor.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,7 @@ class ClangRefactorTool {
462462
ToolActionFactory(TUCallbackType Callback)
463463
: Callback(std::move(Callback)) {}
464464

465-
std::unique_ptr<FrontendAction> create() override {
466-
return llvm::make_unique<ToolASTAction>(Callback);
467-
}
465+
FrontendAction *create() override { return new ToolASTAction(Callback); }
468466

469467
private:
470468
TUCallbackType Callback;

‎clang/unittests/AST/EvaluateAsRValueTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ TEST(EvaluateAsRValue, FailsGracefullyForUnknownTypes) {
9090
std::vector<std::string> Args(1, Mode);
9191
Args.push_back("-fno-delayed-template-parsing");
9292
ASSERT_TRUE(runToolOnCodeWithArgs(
93-
llvm::make_unique<EvaluateConstantInitializersAction>(),
93+
new EvaluateConstantInitializersAction(),
9494
"template <typename T>"
9595
"struct vector {"
9696
" explicit vector(int size);"

‎clang/unittests/CrossTU/CrossTranslationUnitTest.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ class CTUAction : public clang::ASTFrontendAction {
103103

104104
TEST(CrossTranslationUnit, CanLoadFunctionDefinition) {
105105
bool Success = false;
106-
EXPECT_TRUE(tooling::runToolOnCode(llvm::make_unique<CTUAction>(&Success),
107-
"int f(int);"));
106+
EXPECT_TRUE(tooling::runToolOnCode(new CTUAction(&Success), "int f(int);"));
108107
EXPECT_TRUE(Success);
109108
}
110109

‎clang/unittests/Sema/CodeCompleteTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ VisitedContextResults runCodeCompleteOnCode(StringRef Code) {
100100

101101
auto Action = llvm::make_unique<CodeCompleteAction>(
102102
offsetToPosition(WithoutToken, TokenOffset), Results);
103-
clang::tooling::runToolOnCodeWithArgs(std::move(Action), Code, {"-std=c++11"},
103+
clang::tooling::runToolOnCodeWithArgs(Action.release(), Code, {"-std=c++11"},
104104
TestCCName);
105105
return Results;
106106
}

‎clang/unittests/Sema/ExternalSemaSourceTest.cpp‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -221,34 +221,37 @@ class ExternalSemaSourceInstaller : public clang::ASTFrontendAction {
221221

222222
// Make sure that the DiagnosticWatcher is not miscounting.
223223
TEST(ExternalSemaSource, SanityCheck) {
224-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
224+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
225+
new ExternalSemaSourceInstaller);
225226
DiagnosticWatcher Watcher("AAB", "BBB");
226227
Installer->PushWatcher(&Watcher);
227228
std::vector<std::string> Args(1, "-std=c++11");
228229
ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
229-
std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
230+
Installer.release(), "namespace AAA { } using namespace AAB;", Args));
230231
ASSERT_EQ(0, Watcher.SeenCount);
231232
}
232233

233234
// Check that when we add a NamespaceTypeProvider, we use that suggestion
234235
// instead of the usual suggestion we would use above.
235236
TEST(ExternalSemaSource, ExternalTypoCorrectionPrioritized) {
236-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
237+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
238+
new ExternalSemaSourceInstaller);
237239
NamespaceTypoProvider Provider("AAB", "BBB");
238240
DiagnosticWatcher Watcher("AAB", "BBB");
239241
Installer->PushSource(&Provider);
240242
Installer->PushWatcher(&Watcher);
241243
std::vector<std::string> Args(1, "-std=c++11");
242244
ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
243-
std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
245+
Installer.release(), "namespace AAA { } using namespace AAB;", Args));
244246
ASSERT_LE(0, Provider.CallCount);
245247
ASSERT_EQ(1, Watcher.SeenCount);
246248
}
247249

248250
// Check that we use the first successful TypoCorrection returned from an
249251
// ExternalSemaSource.
250252
TEST(ExternalSemaSource, ExternalTypoCorrectionOrdering) {
251-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
253+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
254+
new ExternalSemaSourceInstaller);
252255
NamespaceTypoProvider First("XXX", "BBB");
253256
NamespaceTypoProvider Second("AAB", "CCC");
254257
NamespaceTypoProvider Third("AAB", "DDD");
@@ -259,22 +262,23 @@ TEST(ExternalSemaSource, ExternalTypoCorrectionOrdering) {
259262
Installer->PushWatcher(&Watcher);
260263
std::vector<std::string> Args(1, "-std=c++11");
261264
ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
262-
std::move(Installer), "namespace AAA { } using namespace AAB;", Args));
265+
Installer.release(), "namespace AAA { } using namespace AAB;", Args));
263266
ASSERT_LE(1, First.CallCount);
264267
ASSERT_LE(1, Second.CallCount);
265268
ASSERT_EQ(0, Third.CallCount);
266269
ASSERT_EQ(1, Watcher.SeenCount);
267270
}
268271

269272
TEST(ExternalSemaSource, ExternalDelayedTypoCorrection) {
270-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
273+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
274+
new ExternalSemaSourceInstaller);
271275
FunctionTypoProvider Provider("aaa", "bbb");
272276
DiagnosticWatcher Watcher("aaa", "bbb");
273277
Installer->PushSource(&Provider);
274278
Installer->PushWatcher(&Watcher);
275279
std::vector<std::string> Args(1, "-std=c++11");
276280
ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
277-
std::move(Installer), "namespace AAA { } void foo() { AAA::aaa(); }",
281+
Installer.release(), "namespace AAA { } void foo() { AAA::aaa(); }",
278282
Args));
279283
ASSERT_LE(0, Provider.CallCount);
280284
ASSERT_EQ(1, Watcher.SeenCount);
@@ -283,14 +287,15 @@ TEST(ExternalSemaSource, ExternalDelayedTypoCorrection) {
283287
// We should only try MaybeDiagnoseMissingCompleteType if we can't otherwise
284288
// solve the problem.
285289
TEST(ExternalSemaSource, TryOtherTacticsBeforeDiagnosing) {
286-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
290+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
291+
new ExternalSemaSourceInstaller);
287292
CompleteTypeDiagnoser Diagnoser(false);
288293
Installer->PushSource(&Diagnoser);
289294
std::vector<std::string> Args(1, "-std=c++11");
290295
// This code hits the class template specialization/class member of a class
291296
// template specialization checks in Sema::RequireCompleteTypeImpl.
292297
ASSERT_TRUE(clang::tooling::runToolOnCodeWithArgs(
293-
std::move(Installer),
298+
Installer.release(),
294299
"template <typename T> struct S { class C { }; }; S<char>::C SCInst;",
295300
Args));
296301
ASSERT_EQ(0, Diagnoser.CallCount);
@@ -299,7 +304,8 @@ TEST(ExternalSemaSource, TryOtherTacticsBeforeDiagnosing) {
299304
// The first ExternalSemaSource where MaybeDiagnoseMissingCompleteType returns
300305
// true should be the last one called.
301306
TEST(ExternalSemaSource, FirstDiagnoserTaken) {
302-
auto Installer = llvm::make_unique<ExternalSemaSourceInstaller>();
307+
std::unique_ptr<ExternalSemaSourceInstaller> Installer(
308+
new ExternalSemaSourceInstaller);
303309
CompleteTypeDiagnoser First(false);
304310
CompleteTypeDiagnoser Second(true);
305311
CompleteTypeDiagnoser Third(true);
@@ -308,7 +314,7 @@ TEST(ExternalSemaSource, FirstDiagnoserTaken) {
308314
Installer->PushSource(&Third);
309315
std::vector<std::string> Args(1, "-std=c++11");
310316
ASSERT_FALSE(clang::tooling::runToolOnCodeWithArgs(
311-
std::move(Installer), "class Incomplete; Incomplete IncompleteInstance;",
317+
Installer.release(), "class Incomplete; Incomplete IncompleteInstance;",
312318
Args));
313319
ASSERT_EQ(1, First.CallCount);
314320
ASSERT_EQ(1, Second.CallCount);

‎clang/unittests/Tooling/CommentHandlerTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ class CommentHandlerVisitor : public TestVisitor<CommentHandlerVisitor>,
5656
CommentVerifier GetVerifier();
5757

5858
protected:
59-
std::unique_ptr<FrontendAction> CreateTestAction() override {
60-
return llvm::make_unique<CommentHandlerAction>(this);
59+
ASTFrontendAction *CreateTestAction() override {
60+
return new CommentHandlerAction(this);
6161
}
6262

6363
private:

0 commit comments

Comments
 (0)