diff options
author | Nico Weber <nicolasweber@gmx.de> | 2016-04-18 13:57:08 +0000 |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2016-04-18 13:57:08 +0000 |
commit | ca94d0ec0c1298fec7f3bd5d8e7d537f9efd6142 (patch) | |
tree | e039d0fe888f2c3a631b3bf6aba661a86d8d12df /llvm/tools/lli/ChildTarget/ChildTarget.cpp | |
parent | dd2ca837959c74dcf0bd602748041507597f0493 (diff) | |
download | bcm5719-llvm-ca94d0ec0c1298fec7f3bd5d8e7d537f9efd6142.tar.gz bcm5719-llvm-ca94d0ec0c1298fec7f3bd5d8e7d537f9efd6142.zip |
Revert 266581 (and follow-up 266588), it doesn't build on Windows.
Three problems:
1. <future> can't be easily used. If you must use it, see
include/Support/ThreadPool.h for how.
2. constexpr problems, even after 266588.
3. Move assignment operators can't be defaulted in MSVC2013.
llvm-svn: 266615
Diffstat (limited to 'llvm/tools/lli/ChildTarget/ChildTarget.cpp')
-rw-r--r-- | llvm/tools/lli/ChildTarget/ChildTarget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/lli/ChildTarget/ChildTarget.cpp b/llvm/tools/lli/ChildTarget/ChildTarget.cpp index 33de1850547..93925d6aa87 100644 --- a/llvm/tools/lli/ChildTarget/ChildTarget.cpp +++ b/llvm/tools/lli/ChildTarget/ChildTarget.cpp @@ -54,8 +54,8 @@ int main(int argc, char *argv[]) { JITServer Server(Channel, SymbolLookup, RegisterEHFrames, DeregisterEHFrames); while (1) { - JITServer::JITFuncId Id = JITServer::InvalidId; - if (auto EC = Server.getNextFuncId(Id)) { + JITServer::JITProcId Id = JITServer::InvalidId; + if (auto EC = Server.getNextProcId(Id)) { errs() << "Error: " << EC.message() << "\n"; return 1; } @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) { case JITServer::TerminateSessionId: return 0; default: - if (auto EC = Server.handleKnownFunction(Id)) { + if (auto EC = Server.handleKnownProcedure(Id)) { errs() << "Error: " << EC.message() << "\n"; return 1; } |