From 36cb29cbbe1b22dcd298ad65e1fabe899b7d7249 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Thu, 20 Jan 2022 13:36:55 -0800 Subject: 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::(anonymous)' from module 'LLVM_Utils.Support.Error' is not present in definition of 'llvm::Expected' 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 --- lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h') 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 *g_fcxx_modules_workaround; +// END + #include "lldb/Host/Config.h" // Python.h needs to be included before any system headers in order to avoid -- cgit v1.1