diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2014-09-10 09:35:49 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2014-09-10 09:35:49 +0000 |
commit | a2406fa9e5bef08382981e07dc20cccbdfda25d8 (patch) | |
tree | f8ef9e23c0e0f1fe389ae816b6acee1ce340c209 /clang/unittests/Frontend/FrontendActionTest.cpp | |
parent | ad335cf690c19510d62a3b627e2657bf9b8920fd (diff) | |
download | bcm5719-llvm-a2406fa9e5bef08382981e07dc20cccbdfda25d8.tar.gz bcm5719-llvm-a2406fa9e5bef08382981e07dc20cccbdfda25d8.zip |
Revert over-eager unique_ptr conversion.
This test wants to observe PPCallbacks after they have been moved into the
preprocessor. That doesn't work if the pointer has been moved away.
llvm-svn: 217481
Diffstat (limited to 'clang/unittests/Frontend/FrontendActionTest.cpp')
-rw-r--r-- | clang/unittests/Frontend/FrontendActionTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/unittests/Frontend/FrontendActionTest.cpp b/clang/unittests/Frontend/FrontendActionTest.cpp index bdd22bd1810..31711566921 100644 --- a/clang/unittests/Frontend/FrontendActionTest.cpp +++ b/clang/unittests/Frontend/FrontendActionTest.cpp @@ -111,15 +111,15 @@ struct TestPPCallbacks : public PPCallbacks { }; class TestPPCallbacksFrontendAction : public PreprocessorFrontendAction { - std::unique_ptr<TestPPCallbacks> Callbacks; + TestPPCallbacks *Callbacks; public: - TestPPCallbacksFrontendAction(std::unique_ptr<TestPPCallbacks> C) - : Callbacks(std::move(C)), SeenEnd(false) {} + TestPPCallbacksFrontendAction(TestPPCallbacks *C) + : Callbacks(C), SeenEnd(false) {} void ExecuteAction() override { Preprocessor &PP = getCompilerInstance().getPreprocessor(); - PP.addPPCallbacks(std::move(Callbacks)); + PP.addPPCallbacks(std::unique_ptr<TestPPCallbacks>(Callbacks)); PP.EnterMainSourceFile(); } void EndSourceFileAction() override { SeenEnd = Callbacks->SeenEnd; } @@ -140,8 +140,8 @@ TEST(PreprocessorFrontendAction, EndSourceFile) { Compiler.setInvocation(Invocation); Compiler.createDiagnostics(); - std::unique_ptr<TestPPCallbacks> Callbacks(new TestPPCallbacks); - TestPPCallbacksFrontendAction TestAction(std::move(Callbacks)); + TestPPCallbacks *Callbacks = new TestPPCallbacks; + TestPPCallbacksFrontendAction TestAction(Callbacks); ASSERT_FALSE(Callbacks->SeenEnd); ASSERT_FALSE(TestAction.SeenEnd); ASSERT_TRUE(Compiler.ExecuteAction(TestAction)); |