From 62a56f39b7c5587a1b2144880500689bea5f32e4 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 17 Jul 2014 22:34:12 +0000 Subject: Revert "unique_ptr-ify ownership of ASTConsumers" This reverts commit r213307. Reverting to have some on-list discussion/confirmation about the ongoing direction of smart pointer usage in the LLVM project. llvm-svn: 213325 --- clang/lib/CodeGen/CodeGenAction.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'clang/lib/CodeGen/CodeGenAction.cpp') diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp index 0c949492685..559c2ef4bad 100644 --- a/clang/lib/CodeGen/CodeGenAction.cpp +++ b/clang/lib/CodeGen/CodeGenAction.cpp @@ -590,8 +590,8 @@ static raw_ostream *GetOutputStream(CompilerInstance &CI, llvm_unreachable("Invalid action!"); } -std::unique_ptr -CodeGenAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { +ASTConsumer *CodeGenAction::CreateASTConsumer(CompilerInstance &CI, + StringRef InFile) { BackendAction BA = static_cast(Act); std::unique_ptr OS(GetOutputStream(CI, InFile, BA)); if (BA != Backend_EmitNothing && !OS) @@ -623,12 +623,11 @@ CodeGenAction::CreateASTConsumer(CompilerInstance &CI, StringRef InFile) { LinkModuleToUse = ModuleOrErr.get(); } - auto Result = llvm::make_unique( - BA, CI.getDiagnostics(), CI.getCodeGenOpts(), CI.getTargetOpts(), - CI.getLangOpts(), (bool)CI.getFrontendOpts().ShowTimers, InFile, - LinkModuleToUse, OS.release(), *VMContext); - BEConsumer = Result.get(); - return std::move(Result); + BEConsumer = new BackendConsumer(BA, CI.getDiagnostics(), CI.getCodeGenOpts(), + CI.getTargetOpts(), CI.getLangOpts(), + CI.getFrontendOpts().ShowTimers, InFile, + LinkModuleToUse, OS.release(), *VMContext); + return BEConsumer; } void CodeGenAction::ExecuteAction() { -- cgit v1.2.3