diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2019-09-13 11:59:51 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2019-09-13 11:59:51 +0000 |
commit | 6baaa4be7831ffacc775b421dbc845d6ca6e89b8 (patch) | |
tree | df42836e13793f91ed9e722c1e91183dc3e5283e /llvm/lib/ExecutionEngine/Orc | |
parent | ce74c3b19f5b60d427977f21e506c26a3f40bd7f (diff) | |
download | bcm5719-llvm-6baaa4be7831ffacc775b421dbc845d6ca6e89b8.tar.gz bcm5719-llvm-6baaa4be7831ffacc775b421dbc845d6ca6e89b8.zip |
[Orc] Roll back ThreadPool to std::function
MSVC doesn't allow move-only types in std::packaged_task. Boo.
llvm-svn: 371844
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc')
-rw-r--r-- | llvm/lib/ExecutionEngine/Orc/LLJIT.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp index c6532c60fb8..a80f78afe80 100644 --- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp +++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp @@ -132,7 +132,9 @@ LLJIT::LLJIT(LLJITBuilderState &S, Error &Err) CompileThreads = std::make_unique<ThreadPool>(S.NumCompileThreads); ES->setDispatchMaterialization( [this](JITDylib &JD, std::unique_ptr<MaterializationUnit> MU) { - auto Work = [MU = std::move(MU), &JD] { MU->doMaterialize(JD); }; + // FIXME: Switch to move capture once we have c++14. + auto SharedMU = std::shared_ptr<MaterializationUnit>(std::move(MU)); + auto Work = [SharedMU, &JD]() { SharedMU->doMaterialize(JD); }; CompileThreads->async(std::move(Work)); }); } |