diff options
author | Lang Hames <lhames@gmail.com> | 2019-11-20 17:27:44 -0800 |
---|---|---|
committer | Lang Hames <lhames@gmail.com> | 2019-11-20 17:34:34 -0800 |
commit | 76bcbaafab2db9ee1fa0813463016afb64c5fb41 (patch) | |
tree | 015615c0c4016611d31a2ecffb70857e99ca44d5 /llvm/lib | |
parent | 5c5cf899ef2fda1d3306b1e5c384ae062b80b672 (diff) | |
download | bcm5719-llvm-76bcbaafab2db9ee1fa0813463016afb64c5fb41.tar.gz bcm5719-llvm-76bcbaafab2db9ee1fa0813463016afb64c5fb41.zip |
[Orc][Modules] Fix Modules build fallout from a34680a33eb.
In a34680a33eb OrcError.h and Orc/RPC/*.h were split out from the rest of
ExecutionEngine in order to eliminate false dependencies for remote JIT
targets (see https://reviews.llvm.org/D68732), however this broke modules
builds (see https://reviews.llvm.org/D69817).
This patch splits these headers out into a separate module, LLVM_OrcSupport,
in order to fix the modules build.
Fixes <rdar://56377508>.
Diffstat (limited to 'llvm/lib')
-rw-r--r-- | llvm/lib/ExecutionEngine/OrcError/OrcError.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/ExecutionEngine/OrcError/RPCError.cpp | 5 | ||||
-rw-r--r-- | llvm/lib/Support/Error.cpp | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/OrcError/OrcError.cpp b/llvm/lib/ExecutionEngine/OrcError/OrcError.cpp index e6e9a095319..5eab246d4b4 100644 --- a/llvm/lib/ExecutionEngine/OrcError/OrcError.cpp +++ b/llvm/lib/ExecutionEngine/OrcError/OrcError.cpp @@ -14,6 +14,8 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" +#include <type_traits> + using namespace llvm; using namespace llvm::orc; diff --git a/llvm/lib/ExecutionEngine/OrcError/RPCError.cpp b/llvm/lib/ExecutionEngine/OrcError/RPCError.cpp index b77a526f571..3cf78fd9f7b 100644 --- a/llvm/lib/ExecutionEngine/OrcError/RPCError.cpp +++ b/llvm/lib/ExecutionEngine/OrcError/RPCError.cpp @@ -11,6 +11,11 @@ //===----------------------------------------------------------------------===// #include "llvm/ExecutionEngine/Orc/RPC/RPCUtils.h" +#include "llvm/Support/Error.h" +#include "llvm/Support/raw_ostream.h" + +#include <system_error> +#include <string> char llvm::orc::rpc::RPCFatalError::ID = 0; char llvm::orc::rpc::ConnectionClosed::ID = 0; diff --git a/llvm/lib/Support/Error.cpp b/llvm/lib/Support/Error.cpp index 9ea08c37478..27e0a49e9b8 100644 --- a/llvm/lib/Support/Error.cpp +++ b/llvm/lib/Support/Error.cpp @@ -10,6 +10,7 @@ #include "llvm/ADT/Twine.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" +#include "llvm/Support/Signals.h" #include <system_error> using namespace llvm; @@ -103,11 +104,13 @@ std::error_code errorToErrorCode(Error Err) { #if LLVM_ENABLE_ABI_BREAKING_CHECKS void Error::fatalUncheckedError() const { dbgs() << "Program aborted due to an unhandled Error:\n"; - if (getPtr()) + if (getPtr()) { getPtr()->log(dbgs()); - else + dbgs() << "\n"; + }else dbgs() << "Error value was Success. (Note: Success values must still be " "checked prior to being destroyed).\n"; + PrintStackTrace(); abort(); } #endif |