replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

getLazyIRModule always takes ownership. Make that explicit. 

llvm-svn: 215851
This commit is contained in:
Rafael Espindola 2014-08-17 21:22:19 +00:00
parent ebf56bccfd
commit 2bb0c94d42
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/lib/IRReader/IRReader.cpp
View File

@ -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<MemoryBuffer> Buffer,
SMDiagnostic &Err, LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
(const unsigned char *)Buffer->getBufferEnd())) {
std::string ErrMsg;
ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(Buffer, Context);
ErrorOr<Module *> 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<std::unique_ptr<MemoryBuffer>> 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,