Author: Jonas Devlieghere Date: 2025-04-11T10:44:43-07:00 New Revision: 68ab45f0533f3bbfc1c96bddd53de7e769180219
URL: https://github.com/llvm/llvm-project/commit/68ab45f0533f3bbfc1c96bddd53de7e769180219 DIFF: https://github.com/llvm/llvm-project/commit/68ab45f0533f3bbfc1c96bddd53de7e769180219.diff LOG: Revert "[lldb] ProcessGdbRemote header gardning" This reverts commit 2fd860c1f559c0b0be66cc000e38270a04d0a1a3 as this is causing a EXC_BAD_ACCESS on Darwin: https://green.lab.llvm.org/job/llvm.org/view/LLDB/job/as-lldb-cmake/23807/ https://green.lab.llvm.org/job/llvm.org/view/LLDB/job/lldb-cmake/11255/ Added: Modified: lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h index af2abdf4da5cf..b47fee76a2ab5 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h @@ -10,13 +10,8 @@ #define LLDB_SOURCE_PLUGINS_PROCESS_GDB_REMOTE_GDBREMOTECLIENTBASE_H #include "GDBRemoteCommunication.h" -#include "lldb/Utility/Broadcaster.h" -#include "llvm/ADT/STLFunctionalExtras.h" -#include "llvm/ADT/StringRef.h" -#include <chrono> + #include <condition_variable> -#include <cstdint> -#include <mutex> namespace lldb_private { namespace process_gdb_remote { diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp index 12ae5ce467723..77eadfc8c9f6c 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp @@ -7,7 +7,14 @@ //===----------------------------------------------------------------------===// #include "GDBRemoteCommunication.h" -#include "ProcessGDBRemoteLog.h" + +#include <climits> +#include <cstring> +#include <future> +#include <sys/stat.h> + +#include "lldb/Host/Config.h" +#include "lldb/Host/ConnectionFileDescriptor.h" #include "lldb/Host/FileSystem.h" #include "lldb/Host/Host.h" #include "lldb/Host/HostInfo.h" @@ -23,14 +30,13 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/StreamString.h" +#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" #include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_ZLIB #include "llvm/Support/ScopedPrinter.h" -#include <climits> -#include <cstring> -#include <future> -#include <sys/stat.h> + +#include "ProcessGDBRemoteLog.h" #if defined(__APPLE__) #define DEBUGSERVER_BASENAME "debugserver" diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h index f51b94360d0be..107c0896c4e61 100644 --- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h +++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h @@ -11,16 +11,27 @@ #include "GDBRemoteCommunicationHistory.h" +#include <condition_variable> #include <future> #include <mutex> +#include <queue> #include <string> +#include <vector> + #include "lldb/Core/Communication.h" +#include "lldb/Host/Config.h" #include "lldb/Host/HostThread.h" #include "lldb/Host/Socket.h" #include "lldb/Utility/Args.h" +#include "lldb/Utility/Listener.h" +#include "lldb/Utility/Predicate.h" #include "lldb/Utility/StringExtractorGDBRemote.h" +#include "lldb/lldb-public.h" namespace lldb_private { +namespace repro { +class PacketRecorder; +} namespace process_gdb_remote { enum GDBStoppointType { @@ -151,6 +162,8 @@ class GDBRemoteCommunication : public Communication { void DumpHistory(Stream &strm); + void SetPacketRecorder(repro::PacketRecorder *recorder); + static llvm::Error ConnectLocally(GDBRemoteCommunication &client, GDBRemoteCommunication &server); diff --git a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp index ed77e86ac3701..99d1e12359e72 100644 --- a/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp +++ b/lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp @@ -5,20 +5,16 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // //===----------------------------------------------------------------------===// +#include <future> -#include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h" #include "GDBRemoteTestUtils.h" + #include "Plugins/Process/Utility/LinuxSignals.h" +#include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h" #include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h" #include "lldb/Utility/GDBRemote.h" -#include "lldb/Utility/Listener.h" -#include "llvm/ADT/StringRef.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Testing/Support/Error.h" -#include "gtest/gtest.h" -#include <chrono> -#include <future> -#include <string> -#include <vector> using namespace lldb_private::process_gdb_remote; using namespace lldb_private; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
