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 | 5b6c1e8e5935cb4ed07cb7faf217b828b1397340 (patch) | |
| tree | 8a76fb269c4b96e26c2b364ee3684615bbbeb015 /llvm/lib/Bitcode/Reader/BitReader.cpp | |
| parent | 9853439b5b098989190d0682c569db7a5d996759 (diff) | |
| download | bcm5719-llvm-5b6c1e8e5935cb4ed07cb7faf217b828b1397340.tar.gz bcm5719-llvm-5b6c1e8e5935cb4ed07cb7faf217b828b1397340.zip | |
Update getLazyBitcodeModule to use ErrorOr for error handling.
llvm-svn: 199125
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitReader.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitReader.cpp b/llvm/lib/Bitcode/Reader/BitReader.cpp index 23630e55254..4136cec7c32 100644 --- a/llvm/lib/Bitcode/Reader/BitReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitReader.cpp @@ -51,15 +51,18 @@ LLVMBool LLVMGetBitcodeModuleInContext(LLVMContextRef ContextRef, LLVMModuleRef *OutM, char **OutMessage) { std::string Message; + ErrorOr<Module *> ModuleOrErr = + getLazyBitcodeModule(unwrap(MemBuf), *unwrap(ContextRef)); - *OutM = wrap(getLazyBitcodeModule(unwrap(MemBuf), *unwrap(ContextRef), - &Message)); - if (!*OutM) { + if (error_code EC = ModuleOrErr.getError()) { + *OutM = wrap((Module *)NULL); if (OutMessage) - *OutMessage = strdup(Message.c_str()); + *OutMessage = strdup(EC.message().c_str()); return 1; } + *OutM = wrap(ModuleOrErr.get()); + return 0; } |
