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 /unittests/ExecutionEngine | |
| 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 'unittests/ExecutionEngine')
| -rw-r--r-- | unittests/ExecutionEngine/JIT/JITTest.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unittests/ExecutionEngine/JIT/JITTest.cpp b/unittests/ExecutionEngine/JIT/JITTest.cpp index 47907e1935..1c631a8051 100644 --- a/unittests/ExecutionEngine/JIT/JITTest.cpp +++ b/unittests/ExecutionEngine/JIT/JITTest.cpp @@ -631,13 +631,14 @@ ExecutionEngine *getJITFromBitcode( // c_str() is null-terminated like MemoryBuffer::getMemBuffer requires. MemoryBuffer *BitcodeBuffer = MemoryBuffer::getMemBuffer(Bitcode, "Bitcode for test"); - std::string errMsg; - M = getLazyBitcodeModule(BitcodeBuffer, Context, &errMsg); - if (M == NULL) { - ADD_FAILURE() << errMsg; + ErrorOr<Module*> ModuleOrErr = getLazyBitcodeModule(BitcodeBuffer, Context); + if (error_code EC = ModuleOrErr.getError()) { + ADD_FAILURE() << EC.message(); delete BitcodeBuffer; return NULL; } + M = ModuleOrErr.get(); + std::string errMsg; ExecutionEngine *TheJIT = EngineBuilder(M) .setEngineKind(EngineKind::JIT) .setErrorStr(&errMsg) |