diff options
| author | Lang Hames <lhames@gmail.com> | 2016-07-14 00:37:04 +0000 |
|---|---|---|
| committer | Lang Hames <lhames@gmail.com> | 2016-07-14 00:37:04 +0000 |
| commit | ae610ab528a382a393aae26d2d67cee05cabe634 (patch) | |
| tree | bb4178e75d234c71dac75810b4662a0f979227f0 /llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | |
| parent | 7f781aba9755633c53210db02d51f6f56d11ea48 (diff) | |
| download | bcm5719-llvm-ae610ab528a382a393aae26d2d67cee05cabe634.tar.gz bcm5719-llvm-ae610ab528a382a393aae26d2d67cee05cabe634.zip | |
[Object] Revert r275316, Archive::child_iterator changes, while I update lld.
Should fix the bots broken by r275316.
llvm-svn: 275353
Diffstat (limited to 'llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp index 9da0045d201..30f18db0a46 100644 --- a/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp +++ b/llvm/lib/ExecutionEngine/MCJIT/MCJIT.cpp @@ -327,14 +327,13 @@ 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 - Error Err; - object::Archive::child_iterator ChildIt = A->findSym(Err, Name); - if (Err) - report_fatal_error(std::move(Err)); + object::Archive::child_iterator ChildIt = A->findSym(Name); + if (std::error_code EC = ChildIt->getError()) + report_fatal_error(EC.message()); 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()); |
