diff options
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | 7 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 938b9fb7a54..55c7ff08d2e 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -329,10 +329,13 @@ RuntimeDyld::SymbolInfo MCJIT::findSymbol(const std::string &Name, report_fatal_error(EC.message()); if (ChildIt != A->child_end()) { // FIXME: Support nested archives? - ErrorOr<std::unique_ptr<object::Binary>> ChildBinOrErr = + Expected<std::unique_ptr<object::Binary>> ChildBinOrErr = (*ChildIt)->getAsBinary(); - if (ChildBinOrErr.getError()) + if (!ChildBinOrErr) { + // TODO: Actually report errors helpfully. + consumeError(ChildBinOrErr.takeError()); continue; + } std::unique_ptr<object::Binary> &ChildBin = ChildBinOrErr.get(); if (ChildBin->isObject()) { std::unique_ptr<object::ObjectFile> OF( diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h index 896c184d440..db7c08fa8fc 100644 --- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h +++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h @@ -263,10 +263,13 @@ private: report_fatal_error(EC.message()); if (ChildIt != A->child_end()) { // FIXME: Support nested archives? - ErrorOr<std::unique_ptr<object::Binary>> ChildBinOrErr = + Expected<std::unique_ptr<object::Binary>> ChildBinOrErr = (*ChildIt)->getAsBinary(); - if (ChildBinOrErr.getError()) + if (!ChildBinOrErr) { + // TODO: Actually report errors helpfully. + consumeError(ChildBinOrErr.takeError()); continue; + } std::unique_ptr<object::Binary> &ChildBin = ChildBinOrErr.get(); if (ChildBin->isObject()) { std::vector<std::unique_ptr<object::ObjectFile>> ObjSet; |
