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 | |
parent | 36713c2c0a9e4aeebe4cae4ef5efbc13d4103850 (diff) | |
download | llvm-99c7fec2c94bd44fd16ba50340896287438e6a0e.tar.gz llvm-99c7fec2c94bd44fd16ba50340896287438e6a0e.tar.bz2 llvm-99c7fec2c94bd44fd16ba50340896287438e6a0e.tar.xz |
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')
-rw-r--r-- | lib/Bitcode/Reader/BitReader.cpp | 11 | ||||
-rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 19 | ||||
-rw-r--r-- | lib/IRReader/IRReader.cpp | 9 | ||||
-rw-r--r-- | lib/LTO/LTOModule.cpp | 8 |
4 files changed, 27 insertions, 20 deletions
diff --git a/lib/Bitcode/Reader/BitReader.cpp b/lib/Bitcode/Reader/BitReader.cpp index 23630e5525..4136cec7c3 100644 --- a/lib/Bitcode/Reader/BitReader.cpp +++ b/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; } diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 37515eb6f2..39a0dfa500 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -3274,18 +3274,14 @@ const error_category &BitcodeReader::BitcodeErrorCategory() { /// getLazyBitcodeModule - lazy function-at-a-time loading from a file. /// -Module *llvm::getLazyBitcodeModule(MemoryBuffer *Buffer, - LLVMContext& Context, - std::string *ErrMsg) { +ErrorOr<Module *> llvm::getLazyBitcodeModule(MemoryBuffer *Buffer, + LLVMContext &Context) { Module *M = new Module(Buffer->getBufferIdentifier(), Context); BitcodeReader *R = new BitcodeReader(Buffer, Context); M->setMaterializer(R); if (error_code EC = R->ParseBitcodeInto(M)) { - if (ErrMsg) - *ErrMsg = EC.message(); - delete M; // Also deletes R. - return 0; + return EC; } // Have the BitcodeReader dtor delete 'Buffer'. R->setBufferOwned(true); @@ -3317,8 +3313,13 @@ Module *llvm::getStreamedBitcodeModule(const std::string &name, /// If an error occurs, return null and fill in *ErrMsg if non-null. Module *llvm::ParseBitcodeFile(MemoryBuffer *Buffer, LLVMContext& Context, std::string *ErrMsg){ - Module *M = getLazyBitcodeModule(Buffer, Context, ErrMsg); - if (!M) return 0; + ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(Buffer, Context); + if (error_code EC = ModuleOrErr.getError()) { + if (ErrMsg) + *ErrMsg = EC.message(); + return 0; + } + Module *M = ModuleOrErr.get(); // Don't let the BitcodeReader dtor delete 'Buffer', regardless of whether // there was an error. diff --git a/lib/IRReader/IRReader.cpp b/lib/IRReader/IRReader.cpp index 0e60ca7b32..7356fd005a 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); diff --git a/lib/LTO/LTOModule.cpp b/lib/LTO/LTOModule.cpp index 49f95a6402..dcfd59e752 100644 --- a/lib/LTO/LTOModule.cpp +++ b/lib/LTO/LTOModule.cpp @@ -135,12 +135,14 @@ LTOModule *LTOModule::makeLTOModule(MemoryBuffer *buffer, TargetOptions options, std::string &errMsg) { // parse bitcode buffer - OwningPtr<Module> m(getLazyBitcodeModule(buffer, getGlobalContext(), - &errMsg)); - if (!m) { + ErrorOr<Module *> ModuleOrErr = + getLazyBitcodeModule(buffer, getGlobalContext()); + if (error_code EC = ModuleOrErr.getError()) { + errMsg = EC.message(); delete buffer; return NULL; } + OwningPtr<Module> m(ModuleOrErr.get()); std::string TripleStr = m->getTargetTriple(); if (TripleStr.empty()) |