From a2406fa9e5bef08382981e07dc20cccbdfda25d8 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Wed, 10 Sep 2014 09:35:49 +0000 Subject: [PATCH] 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 --- clang/unittests/Frontend/FrontendActionTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clang/unittests/Frontend/FrontendActionTest.cpp b/clang/unittests/Frontend/FrontendActionTest.cpp index bdd22bd1810f..31711566921c 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 Callbacks; + TestPPCallbacks *Callbacks; public: - TestPPCallbacksFrontendAction(std::unique_ptr 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(Callbacks)); PP.EnterMainSourceFile(); } void EndSourceFileAction() override { SeenEnd = Callbacks->SeenEnd; } @@ -140,8 +140,8 @@ TEST(PreprocessorFrontendAction, EndSourceFile) { Compiler.setInvocation(Invocation); Compiler.createDiagnostics(); - std::unique_ptr 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));