diff options
Diffstat (limited to 'lib/IRReader/IRReader.cpp')
| -rw-r--r-- | lib/IRReader/IRReader.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index 01aa074aba..2bbe075332 100644 --- a/lib/IRReader/IRReader.cpp +++ b/lib/IRReader/IRReader.cpp @@ -39,7 +39,7 @@ Module *llvm::getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err, if (std::error_code EC = ModuleOrErr.getError()) { Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error, EC.message()); - // ParseBitcodeFile does not take ownership of the Buffer in the + // getLazyBitcodeModule does not take ownership of the Buffer in the // case of an error. delete Buffer; return nullptr; @@ -62,13 +62,14 @@ Module *llvm::getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err return getLazyIRModule(File.release(), Err, Context); } -Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, +Module *llvm::ParseIR(const 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); + ErrorOr<Module *> ModuleOrErr = + parseBitcodeFile(const_cast<MemoryBuffer *>(Buffer), Context); Module *M = nullptr; if (std::error_code EC = ModuleOrErr.getError()) Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error, @@ -76,11 +77,12 @@ Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, else M = ModuleOrErr.get(); // parseBitcodeFile does not take ownership of the Buffer. - delete Buffer; return M; } - return ParseAssembly(Buffer, nullptr, Err, Context); + return ParseAssembly(MemoryBuffer::getMemBuffer( + Buffer->getBuffer(), Buffer->getBufferIdentifier()), + nullptr, Err, Context); } Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, @@ -92,7 +94,7 @@ Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, return nullptr; } - return ParseIR(File.release(), Err, Context); + return ParseIR(File.get(), Err, Context); } //===----------------------------------------------------------------------===// @@ -104,7 +106,8 @@ LLVMBool LLVMParseIRInContext(LLVMContextRef ContextRef, char **OutMessage) { SMDiagnostic Diag; - *OutM = wrap(ParseIR(unwrap(MemBuf), Diag, *unwrap(ContextRef))); + std::unique_ptr<MemoryBuffer> MB(unwrap(MemBuf)); + *OutM = wrap(ParseIR(MB.get(), Diag, *unwrap(ContextRef))); if(!*OutM) { if (OutMessage) { |