[Lldb-commits] [lldb] r355842 - [Reproducers] Replace callbacks with void*

[Jonas Devlieghere via lldb-commits]

Author: jdevlieghere
Date: Mon Mar 11 10:17:51 2019
New Revision: 355842

URL: http://llvm.org/viewvc/llvm-project?rev=355842&view=rev
Log:
[Reproducers] Replace callbacks with void*

Callbacks in the LLDB_RECORD_DUMMY macros were causing build failures
with the Xcode project. This patch replaces the function pointers with
void pointers so they can be logged.

Modified:
    lldb/trunk/source/API/SBCommunication.cpp
    lldb/trunk/source/API/SBDebugger.cpp
    lldb/trunk/source/API/SBExpressionOptions.cpp

Modified: lldb/trunk/source/API/SBCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBCommunication.cpp?rev=355842&r1=355841&r2=355842&view=diff
==============================================================================
--- lldb/trunk/source/API/SBCommunication.cpp (original)
+++ lldb/trunk/source/API/SBCommunication.cpp Mon Mar 11 10:17:51 2019
@@ -157,7 +157,7 @@ bool SBCommunication::ReadThreadIsRunnin
 
 bool SBCommunication::SetReadThreadBytesReceivedCallback(
     ReadThreadBytesReceived callback, void *callback_baton) {
-  LLDB_RECORD_DUMMY(bool, SBCommunication, SetReadThreadBytesReceivedCallback,
+  LLDB_RECORD_DUMMY(bool, SBCommunication, void *,
                     (lldb::SBCommunication::ReadThreadBytesReceived, void *),
                     callback, callback_baton);
 

Modified: lldb/trunk/source/API/SBDebugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBDebugger.cpp?rev=355842&r1=355841&r2=355842&view=diff
==============================================================================
--- lldb/trunk/source/API/SBDebugger.cpp (original)
+++ lldb/trunk/source/API/SBDebugger.cpp Mon Mar 11 10:17:51 2019
@@ -141,13 +141,11 @@ 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 &,
-       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);
+  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);
 
   return SBError();
 }
@@ -239,8 +237,7 @@ SBDebugger SBDebugger::Create(bool sourc
 
 {
   LLDB_RECORD_DUMMY(lldb::SBDebugger, SBDebugger, Create,
-                    (bool, lldb::LogOutputCallback, void *), source_init_files,
-                    callback, baton);
+                    (bool, void *, void *), source_init_files, callback, baton);
 
   SBDebugger debugger;
 
@@ -1536,8 +1533,8 @@ bool SBDebugger::EnableLog(const char *c
 
 void SBDebugger::SetLoggingCallback(lldb::LogOutputCallback log_callback,
                                     void *baton) {
-  LLDB_RECORD_DUMMY(void, SBDebugger, SetLoggingCallback,
-                    (lldb::LogOutputCallback, void *), log_callback, baton);
+  LLDB_RECORD_DUMMY(void, SBDebugger, SetLoggingCallback, (void *, void *),
+                    log_callback, baton);
 
   if (m_opaque_sp) {
     return m_opaque_sp->SetLoggingCallback(log_callback, baton);

Modified: lldb/trunk/source/API/SBExpressionOptions.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBExpressionOptions.cpp?rev=355842&r1=355841&r2=355842&view=diff
==============================================================================
--- lldb/trunk/source/API/SBExpressionOptions.cpp (original)
+++ lldb/trunk/source/API/SBExpressionOptions.cpp Mon Mar 11 10:17:51 2019
@@ -180,7 +180,7 @@ void SBExpressionOptions::SetLanguage(ll
 void SBExpressionOptions::SetCancelCallback(
     lldb::ExpressionCancelCallback callback, void *baton) {
   LLDB_RECORD_DUMMY(void, SBExpressionOptions, SetCancelCallback,
-                    (lldb::ExpressionCancelCallback, void *), callback, baton);
+                    (void *, void *), callback, baton);
 
   m_opaque_up->SetCancelCallback(callback, baton);
 }