diff options
| author | Lang Hames <lhames@gmail.com> | 2016-07-14 02:24:01 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2016-07-14 02:24:01 +0000 |
| commit | fc209623e976118cf016c0d3c1dccacb6bfa27c1 (patch) | |
| tree | 407a60990972f87acb6c6aed9c218ac6ab4b203a /llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | |
| parent | af7e8465e1fabdfff6c3a08a14cdb83ed79a10dc (diff) | |
| download | llvm-fc209623e976118cf016c0d3c1dccacb6bfa27c1.zip llvm-fc209623e976118cf016c0d3c1dccacb6bfa27c1.tar.gz llvm-fc209623e976118cf016c0d3c1dccacb6bfa27c1.tar.bz2 | |
[Object] Re-apply r275316 now that I have the corresponding LLD patch ready.
llvm-svn: 275361
Diffstat (limited to 'llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 30f18db..9da0045 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -327,13 +327,14 @@ RuntimeDyld::SymbolInfo MCJIT::findSymbol(const std::string &Name, for (object::OwningBinary<object::Archive> &OB : Archives) { object::Archive *A = OB.getBinary(); // Look for our symbols in each Archive - object::Archive::child_iterator ChildIt = A->findSym(Name); - if (std::error_code EC = ChildIt->getError()) - report_fatal_error(EC.message()); + Error Err; + object::Archive::child_iterator ChildIt = A->findSym(Err, Name); + if (Err) + report_fatal_error(std::move(Err)); if (ChildIt != A->child_end()) { // FIXME: Support nested archives? Expected<std::unique_ptr<object::Binary>> ChildBinOrErr = - (*ChildIt)->getAsBinary(); + ChildIt->getAsBinary(); if (!ChildBinOrErr) { // TODO: Actually report errors helpfully. consumeError(ChildBinOrErr.takeError()); |