diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-08-26 17:29:46 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-08-26 17:29:46 +0000 |
commit | 81e49922a8c88c6c221c2665f298b8584cb3182e (patch) | |
tree | ea729dfff346e044762677d9eacf1d18861a2652 /lib/IRReader | |
parent | 1bfd87a1507609df1ec7ebbff66f725c8dcede4e (diff) |
Return a std::unique_ptr from the IRReader.h functions. NFC.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216466 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IRReader')
-rw-r--r-- | lib/IRReader/IRReader.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index 22a7493b70f..259b41af24f 100644 --- a/lib/IRReader/IRReader.cpp +++ b/lib/IRReader/IRReader.cpp @@ -49,8 +49,9 @@ getLazyIRModule(std::unique_ptr<MemoryBuffer> Buffer, SMDiagnostic &Err, return parseAssembly(std::move(Buffer), Err, Context); } -Module *llvm::getLazyIRFileModule(const std::string &Filename, - SMDiagnostic &Err, LLVMContext &Context) { +std::unique_ptr<Module> llvm::getLazyIRFileModule(StringRef Filename, + SMDiagnostic &Err, + LLVMContext &Context) { ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = MemoryBuffer::getFileOrSTDIN(Filename); if (std::error_code EC = FileOrErr.getError()) { @@ -59,33 +60,31 @@ Module *llvm::getLazyIRFileModule(const std::string &Filename, return nullptr; } - return getLazyIRModule(std::move(FileOrErr.get()), Err, Context).release(); + return getLazyIRModule(std::move(FileOrErr.get()), Err, Context); } -Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, - LLVMContext &Context) { +std::unique_ptr<Module> llvm::parseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, + LLVMContext &Context) { NamedRegionTimer T(TimeIRParsingName, TimeIRParsingGroupName, TimePassesIsEnabled); if (isBitcode((const unsigned char *)Buffer->getBufferStart(), (const unsigned char *)Buffer->getBufferEnd())) { ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(Buffer, Context); - Module *M = nullptr; - if (std::error_code EC = ModuleOrErr.getError()) + if (std::error_code EC = ModuleOrErr.getError()) { Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error, EC.message()); - else - M = ModuleOrErr.get(); - // parseBitcodeFile does not take ownership of the Buffer. - return M; + return nullptr; + } + return std::unique_ptr<Module>(ModuleOrErr.get()); } return parseAssembly(std::unique_ptr<MemoryBuffer>(MemoryBuffer::getMemBuffer( Buffer->getBuffer(), Buffer->getBufferIdentifier())), - Err, Context).release(); + Err, Context); } -Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, - LLVMContext &Context) { +std::unique_ptr<Module> llvm::parseIRFile(StringRef Filename, SMDiagnostic &Err, + LLVMContext &Context) { ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = MemoryBuffer::getFileOrSTDIN(Filename); if (std::error_code EC = FileOrErr.getError()) { @@ -94,7 +93,7 @@ Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, return nullptr; } - return ParseIR(FileOrErr.get().get(), Err, Context); + return parseIR(FileOrErr.get().get(), Err, Context); } //===----------------------------------------------------------------------===// @@ -107,7 +106,7 @@ LLVMBool LLVMParseIRInContext(LLVMContextRef ContextRef, SMDiagnostic Diag; std::unique_ptr<MemoryBuffer> MB(unwrap(MemBuf)); - *OutM = wrap(ParseIR(MB.get(), Diag, *unwrap(ContextRef))); + *OutM = wrap(parseIR(MB.get(), Diag, *unwrap(ContextRef)).release()); if(!*OutM) { if (OutMessage) { |