diff options
author | Lang Hames <lhames@gmail.com> | 2018-07-20 22:22:19 +0000 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2018-07-20 22:22:19 +0000 |
commit | a48d1083537c545577153726ff98337a2a17efd7 (patch) | |
tree | cac9875ff82f56235c16b9bde05741c14463a9f8 /llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h | |
parent | 7b04405cce80d3814938e154707c8fa77f62f74f (diff) | |
download | bcm5719-llvm-a48d1083537c545577153726ff98337a2a17efd7.tar.gz bcm5719-llvm-a48d1083537c545577153726ff98337a2a17efd7.zip |
Re-apply r337595 with fix for LLVM_ENABLE_THREADS=Off.
llvm-svn: 337626
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h')
-rw-r--r-- | llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h index ded53ac3106..abe89ce70af 100644 --- a/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h +++ b/llvm/lib/ExecutionEngine/Orc/OrcMCJITReplacement.h @@ -178,11 +178,11 @@ class OrcMCJITReplacement : public ExecutionEngine { Query->notifySymbolReady(); NewSymbolsResolved = true; } else { - M.ES.failQuery(*Query, Addr.takeError()); + M.ES.legacyFailQuery(*Query, Addr.takeError()); return SymbolNameSet(); } } else if (auto Err = Sym.takeError()) { - M.ES.failQuery(*Query, std::move(Err)); + M.ES.legacyFailQuery(*Query, std::move(Err)); return SymbolNameSet(); } else { if (auto Sym2 = M.ClientResolver->findSymbol(*S)) { @@ -191,11 +191,11 @@ class OrcMCJITReplacement : public ExecutionEngine { Query->notifySymbolReady(); NewSymbolsResolved = true; } else { - M.ES.failQuery(*Query, Addr.takeError()); + M.ES.legacyFailQuery(*Query, Addr.takeError()); return SymbolNameSet(); } } else if (auto Err = Sym2.takeError()) { - M.ES.failQuery(*Query, std::move(Err)); + M.ES.legacyFailQuery(*Query, std::move(Err)); return SymbolNameSet(); } else UnresolvedSymbols.insert(S); |