From 283c82abaaa85d032725cba11fb9ad05c9a9b060 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sun, 17 Aug 2014 21:22:19 +0000 Subject: [PATCH] getLazyIRModule always takes ownership. Make that explicit. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215851 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IRReader/IRReader.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index f8d2f5a9bd8..5675e03585e 100644 --- a/lib/IRReader/IRReader.cpp +++ b/lib/IRReader/IRReader.cpp @@ -29,28 +29,27 @@ namespace llvm { static const char *const TimeIRParsingGroupName = "LLVM IR Parsing"; static const char *const TimeIRParsingName = "Parse IR"; -static Module *getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err, - LLVMContext &Context) { +static Module *getLazyIRModule(std::unique_ptr Buffer, + SMDiagnostic &Err, LLVMContext &Context) { if (isBitcode((const unsigned char *)Buffer->getBufferStart(), (const unsigned char *)Buffer->getBufferEnd())) { std::string ErrMsg; - ErrorOr ModuleOrErr = getLazyBitcodeModule(Buffer, Context); + ErrorOr ModuleOrErr = getLazyBitcodeModule(Buffer.get(), Context); if (std::error_code EC = ModuleOrErr.getError()) { Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error, EC.message()); - // getLazyBitcodeModule does not take ownership of the Buffer in the - // case of an error. - delete Buffer; return nullptr; } + // getLazyBitcodeModule takes ownership of the Buffer when successful. + Buffer.release(); return ModuleOrErr.get(); } - return ParseAssembly(Buffer, nullptr, Err, Context); + return ParseAssembly(Buffer.release(), nullptr, Err, Context); } -Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err, - LLVMContext &Context) { +Module *llvm::getLazyIRFileModule(const std::string &Filename, + SMDiagnostic &Err, LLVMContext &Context) { ErrorOr> FileOrErr = MemoryBuffer::getFileOrSTDIN(Filename); if (std::error_code EC = FileOrErr.getError()) { @@ -59,7 +58,7 @@ Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err return nullptr; } - return getLazyIRModule(FileOrErr.get().release(), Err, Context); + return getLazyIRModule(std::move(FileOrErr.get()), Err, Context); } Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err,