diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-15 01:08:23 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-15 01:08:23 +0000 |
| commit | 8f31e213e425a3cab12b37941b5102533fc8ddbe (patch) | |
| tree | e9afe480a039ae71d0008222c11367067a1d35eb /llvm/lib/Bitcode/Reader/BitReader.cpp | |
| parent | bae1bcb6bf47c6227aaae4758ff91c52f8fc4e9b (diff) | |
| download | bcm5719-llvm-8f31e213e425a3cab12b37941b5102533fc8ddbe.tar.gz bcm5719-llvm-8f31e213e425a3cab12b37941b5102533fc8ddbe.zip | |
Make parseBitcodeFile return an ErrorOr<Module *>.
llvm-svn: 199279
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitReader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitReader.cpp b/llvm/lib/Bitcode/Reader/BitReader.cpp index 4136cec7c32..3e360a8b760 100644 --- a/llvm/lib/Bitcode/Reader/BitReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitReader.cpp @@ -30,16 +30,16 @@ LLVMBool LLVMParseBitcodeInContext(LLVMContextRef ContextRef, LLVMMemoryBufferRef MemBuf, LLVMModuleRef *OutModule, char **OutMessage) { - std::string Message; - - *OutModule = wrap(ParseBitcodeFile(unwrap(MemBuf), *unwrap(ContextRef), - &Message)); - if (!*OutModule) { + ErrorOr<Module *> ModuleOrErr = + parseBitcodeFile(unwrap(MemBuf), *unwrap(ContextRef)); + if (error_code EC = ModuleOrErr.getError()) { if (OutMessage) - *OutMessage = strdup(Message.c_str()); + *OutMessage = strdup(EC.message().c_str()); + *OutModule = wrap((Module*)0); return 1; } + *OutModule = wrap(ModuleOrErr.get()); return 0; } |
