diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-13 18:31:04 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-13 18:31:04 +0000 |
commit | 99c7fec2c94bd44fd16ba50340896287438e6a0e (patch) | |
tree | 22f3840ee88db8e6fcb0dd28c768c11464cd88a5 /lib/IRReader | |
parent | 36713c2c0a9e4aeebe4cae4ef5efbc13d4103850 (diff) |
Update getLazyBitcodeModule to use ErrorOr for error handling.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199125 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IRReader')
-rw-r--r-- | lib/IRReader/IRReader.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index 0e60ca7b32f..7356fd005ad 100644 --- a/lib/IRReader/IRReader.cpp +++ b/lib/IRReader/IRReader.cpp @@ -36,15 +36,16 @@ Module *llvm::getLazyIRModule(MemoryBuffer *Buffer, SMDiagnostic &Err, if (isBitcode((const unsigned char *)Buffer->getBufferStart(), (const unsigned char *)Buffer->getBufferEnd())) { std::string ErrMsg; - Module *M = getLazyBitcodeModule(Buffer, Context, &ErrMsg); - if (M == 0) { + ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(Buffer, Context); + if (error_code EC = ModuleOrErr.getError()) { Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error, - ErrMsg); + EC.message()); // ParseBitcodeFile does not take ownership of the Buffer in the // case of an error. delete Buffer; + return NULL; } - return M; + return ModuleOrErr.get(); } return ParseAssembly(Buffer, 0, Err, Context); |