Author: Alexandre Ganea Date: 2019-12-03T09:53:26-05:00 New Revision: 1cc0ba4cbdc54200e1b3c65e83e51a5368a819ea
URL: https://github.com/llvm/llvm-project/commit/1cc0ba4cbdc54200e1b3c65e83e51a5368a819ea DIFF: https://github.com/llvm/llvm-project/commit/1cc0ba4cbdc54200e1b3c65e83e51a5368a819ea.diff LOG: [LLDB] Disable MSVC warning C4190: 'LLDBSwigPythonBreakpointCallbackFunction' has C-linkage specified, but returns UDT 'llvm::Expected<bool>' which is incompatible with C Differential Revision: https://reviews.llvm.org/D70830 Added: Modified: lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp lldb/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp index 5ed01cf47934..f6b918399cdc 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp @@ -77,11 +77,23 @@ extern "C" void init_lldb(void); #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" +// Disable warning C4190: 'LLDBSwigPythonBreakpointCallbackFunction' has +// C-linkage specified, but returns UDT 'llvm::Expected<bool>' which is +// incompatible with C +#if _MSC_VER +#pragma warning (push) +#pragma warning (disable : 4190) +#endif + extern "C" llvm::Expected<bool> LLDBSwigPythonBreakpointCallbackFunction( const char *python_function_name, const char *session_dictionary_name, const lldb::StackFrameSP &sb_frame, const lldb::BreakpointLocationSP &sb_bp_loc, StructuredDataImpl *args_impl); +#if _MSC_VER +#pragma warning (pop) +#endif + #pragma clang diagnostic pop extern "C" bool LLDBSwigPythonWatchpointCallbackFunction( diff --git a/lldb/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp b/lldb/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp index 12ffdfe79ec3..8bc510bd989a 100644 --- a/lldb/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp +++ b/lldb/unittests/ScriptInterpreter/Python/PythonTestSuite.cpp @@ -62,6 +62,14 @@ extern "C" void init_lldb(void) {} #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wreturn-type-c-linkage" +// Disable warning C4190: 'LLDBSwigPythonBreakpointCallbackFunction' has +// C-linkage specified, but returns UDT 'llvm::Expected<bool>' which is +// incompatible with C +#if _MSC_VER +#pragma warning (push) +#pragma warning (disable : 4190) +#endif + extern "C" llvm::Expected<bool> LLDBSwigPythonBreakpointCallbackFunction( const char *python_function_name, const char *session_dictionary_name, const lldb::StackFrameSP &sb_frame, @@ -70,6 +78,10 @@ extern "C" llvm::Expected<bool> LLDBSwigPythonBreakpointCallbackFunction( return false; } +#if _MSC_VER +#pragma warning (pop) +#endif + #pragma clang diagnostic pop extern "C" bool LLDBSwigPythonWatchpointCallbackFunction( _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
