diff options
| -rw-r--r-- | lldb/include/lldb/Utility/ReproducerInstrumentation.h | 5 | ||||
| -rw-r--r-- | lldb/source/API/SBCommunication.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/API/SBDebugger.cpp | 19 | ||||
| -rw-r--r-- | lldb/source/API/SBExpressionOptions.cpp | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/lldb/include/lldb/Utility/ReproducerInstrumentation.h b/lldb/include/lldb/Utility/ReproducerInstrumentation.h index adba3aacb95..eeb9ab09990 100644 --- a/lldb/include/lldb/Utility/ReproducerInstrumentation.h +++ b/lldb/include/lldb/Utility/ReproducerInstrumentation.h @@ -37,6 +37,11 @@ inline void log_append(llvm::raw_string_ostream &ss, const T *t) { ss << t; } +template <typename T, typename... E> +inline void log_append(llvm::raw_string_ostream &ss, T (*t)(E...)) { + ss << &t; +} + template <> inline void log_append<char>(llvm::raw_string_ostream &ss, const char *t) { ss << t; diff --git a/lldb/source/API/SBCommunication.cpp b/lldb/source/API/SBCommunication.cpp index 99f9a4f650d..6c2efa5f77c 100644 --- a/lldb/source/API/SBCommunication.cpp +++ b/lldb/source/API/SBCommunication.cpp @@ -157,7 +157,7 @@ bool SBCommunication::ReadThreadIsRunning() { bool SBCommunication::SetReadThreadBytesReceivedCallback( ReadThreadBytesReceived callback, void *callback_baton) { - LLDB_RECORD_DUMMY(bool, SBCommunication, void *, + LLDB_RECORD_DUMMY(bool, SBCommunication, SetReadThreadBytesReceivedCallback, (lldb::SBCommunication::ReadThreadBytesReceived, void *), callback, callback_baton); diff --git a/lldb/source/API/SBDebugger.cpp b/lldb/source/API/SBDebugger.cpp index 82661f48158..693b0fefee6 100644 --- a/lldb/source/API/SBDebugger.cpp +++ b/lldb/source/API/SBDebugger.cpp @@ -141,11 +141,13 @@ SBError SBInputReader::Initialize( unsigned long), void *a, lldb::InputReaderGranularity b, char const *c, char const *d, bool e) { - LLDB_RECORD_DUMMY(lldb::SBError, SBInputReader, Initialize, - (lldb::SBDebugger &, void *, void *, - lldb::InputReaderGranularity, const char *, const char *, - bool), - sb_debugger, callback, a, b, c, d, e); + LLDB_RECORD_DUMMY( + lldb::SBError, SBInputReader, Initialize, + (lldb::SBDebugger &, + unsigned long (*)(void *, lldb::SBInputReader *, lldb::InputReaderAction, + const char *, unsigned long), + void *, lldb::InputReaderGranularity, const char *, const char *, bool), + sb_debugger, callback, a, b, c, d, e); return SBError(); } @@ -237,7 +239,8 @@ SBDebugger SBDebugger::Create(bool source_init_files, { LLDB_RECORD_DUMMY(lldb::SBDebugger, SBDebugger, Create, - (bool, void *, void *), source_init_files, callback, baton); + (bool, lldb::LogOutputCallback, void *), source_init_files, + callback, baton); SBDebugger debugger; @@ -1533,8 +1536,8 @@ bool SBDebugger::EnableLog(const char *channel, const char **categories) { void SBDebugger::SetLoggingCallback(lldb::LogOutputCallback log_callback, void *baton) { - LLDB_RECORD_DUMMY(void, SBDebugger, SetLoggingCallback, (void *, void *), - log_callback, baton); + LLDB_RECORD_DUMMY(void, SBDebugger, SetLoggingCallback, + (lldb::LogOutputCallback, void *), log_callback, baton); if (m_opaque_sp) { return m_opaque_sp->SetLoggingCallback(log_callback, baton); diff --git a/lldb/source/API/SBExpressionOptions.cpp b/lldb/source/API/SBExpressionOptions.cpp index e8ca600ec6f..ab9c1494ae5 100644 --- a/lldb/source/API/SBExpressionOptions.cpp +++ b/lldb/source/API/SBExpressionOptions.cpp @@ -180,7 +180,7 @@ void SBExpressionOptions::SetLanguage(lldb::LanguageType language) { void SBExpressionOptions::SetCancelCallback( lldb::ExpressionCancelCallback callback, void *baton) { LLDB_RECORD_DUMMY(void, SBExpressionOptions, SetCancelCallback, - (void *, void *), callback, baton); + (lldb::ExpressionCancelCallback, void *), callback, baton); m_opaque_up->SetCancelCallback(callback, baton); } |
