diff options
| author | Adrian Prantl <aprantl@apple.com> | 2022-01-20 13:36:55 -0800 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2022-01-20 13:39:48 -0800 |
| commit | 36cb29cbbe1b22dcd298ad65e1fabe899b7d7249 (patch) | |
| tree | e1c9e96a78242ba95e2f5a15602b4bd40756bebf /lldb/source/Plugins/ScriptInterpreter/Python | |
| parent | 4af11272f57a4a6fed2932e9e0857b2c1a707c51 (diff) | |
| download | llvm-36cb29cbbe1b22dcd298ad65e1fabe899b7d7249.zip llvm-36cb29cbbe1b22dcd298ad65e1fabe899b7d7249.tar.gz llvm-36cb29cbbe1b22dcd298ad65e1fabe899b7d7249.tar.bz2 | |
Work around a module build failure on the bots.
This patch works around what looks like a bug in Clang itself.
The error on the bot is:
https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/40466/consoleText
In module 'LLVM_Utils' imported from /Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h:18:
/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/llvm/include/llvm/Support/Error.h:720:3: error: 'llvm::Expected<bool>::(anonymous)' from module 'LLVM_Utils.Support.Error' is not present in definition of 'llvm::Expected<bool>' in module 'LLVM_Utils.Support.Error'
union {
^
/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/llvm/include/llvm/Support/Error.h:720:3: note: declaration of '' does not match
/Users/buildslave/jenkins/workspace/lldb-cmake/llvm-project/llvm/include/llvm/Support/Error.h:720:3: note: declaration of '' does not match
1 error generated.
The intention is to revert this as soon as a proper fix has been identified!
rdar://87845391
Diffstat (limited to 'lldb/source/Plugins/ScriptInterpreter/Python')
| -rw-r--r-- | lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h index 48f27b0..c99372f 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h @@ -9,6 +9,13 @@ #ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H #define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H +// BEGIN FIXME +// This declaration works around a clang module build failure. +// It should be deleted ASAP. +#include "llvm/Support/Error.h" +static llvm::Expected<bool> *g_fcxx_modules_workaround; +// END + #include "lldb/Host/Config.h" // Python.h needs to be included before any system headers in order to avoid |