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 | 09039786d9e1a91d5999d4a0ec32b6005ee598d8 (patch) | |
tree | 1ed6cc7810e180862451a6dcd72e7f9cd85ba84a /unittests/Frontend/FrontendActionTest.cpp | |
parent | c6da4d1d6ce3e453deb29972f8dc3807500bbd1d (diff) |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217481 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Frontend/FrontendActionTest.cpp')
-rw-r--r-- | unittests/Frontend/FrontendActionTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unittests/Frontend/FrontendActionTest.cpp b/unittests/Frontend/FrontendActionTest.cpp index bdd22bd181..3171156692 100644 --- a/unittests/Frontend/FrontendActionTest.cpp +++ b/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)); |