Skip to content

Commit 68ab45f

Browse files
committed
Revert "[lldb] ProcessGdbRemote header gardning"
This reverts commit 2fd860c 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/
1 parent bd0b2bd commit 68ab45f

File tree

4 files changed

+29
-19
lines changed

4 files changed

+29
-19
lines changed

lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@
1010
#define LLDB_SOURCE_PLUGINS_PROCESS_GDB_REMOTE_GDBREMOTECLIENTBASE_H
1111

1212
#include "GDBRemoteCommunication.h"
13-
#include "lldb/Utility/Broadcaster.h"
14-
#include "llvm/ADT/STLFunctionalExtras.h"
15-
#include "llvm/ADT/StringRef.h"
16-
#include <chrono>
13+
1714
#include <condition_variable>
18-
#include <cstdint>
19-
#include <mutex>
2015

2116
namespace lldb_private {
2217
namespace process_gdb_remote {

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,14 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "GDBRemoteCommunication.h"
10-
#include "ProcessGDBRemoteLog.h"
10+
11+
#include <climits>
12+
#include <cstring>
13+
#include <future>
14+
#include <sys/stat.h>
15+
16+
#include "lldb/Host/Config.h"
17+
#include "lldb/Host/ConnectionFileDescriptor.h"
1118
#include "lldb/Host/FileSystem.h"
1219
#include "lldb/Host/Host.h"
1320
#include "lldb/Host/HostInfo.h"
@@ -23,14 +30,13 @@
2330
#include "lldb/Utility/Log.h"
2431
#include "lldb/Utility/RegularExpression.h"
2532
#include "lldb/Utility/StreamString.h"
33+
#include "llvm/ADT/ArrayRef.h"
2634
#include "llvm/ADT/SmallString.h"
2735
#include "llvm/ADT/StringRef.h"
2836
#include "llvm/Config/llvm-config.h" // for LLVM_ENABLE_ZLIB
2937
#include "llvm/Support/ScopedPrinter.h"
30-
#include <climits>
31-
#include <cstring>
32-
#include <future>
33-
#include <sys/stat.h>
38+
39+
#include "ProcessGDBRemoteLog.h"
3440

3541
#if defined(__APPLE__)
3642
#define DEBUGSERVER_BASENAME "debugserver"

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,27 @@
1111

1212
#include "GDBRemoteCommunicationHistory.h"
1313

14+
#include <condition_variable>
1415
#include <future>
1516
#include <mutex>
17+
#include <queue>
1618
#include <string>
19+
#include <vector>
20+
1721
#include "lldb/Core/Communication.h"
22+
#include "lldb/Host/Config.h"
1823
#include "lldb/Host/HostThread.h"
1924
#include "lldb/Host/Socket.h"
2025
#include "lldb/Utility/Args.h"
26+
#include "lldb/Utility/Listener.h"
27+
#include "lldb/Utility/Predicate.h"
2128
#include "lldb/Utility/StringExtractorGDBRemote.h"
29+
#include "lldb/lldb-public.h"
2230

2331
namespace lldb_private {
32+
namespace repro {
33+
class PacketRecorder;
34+
}
2435
namespace process_gdb_remote {
2536

2637
enum GDBStoppointType {
@@ -151,6 +162,8 @@ class GDBRemoteCommunication : public Communication {
151162

152163
void DumpHistory(Stream &strm);
153164

165+
void SetPacketRecorder(repro::PacketRecorder *recorder);
166+
154167
static llvm::Error ConnectLocally(GDBRemoteCommunication &client,
155168
GDBRemoteCommunication &server);
156169

lldb/unittests/Process/gdb-remote/GDBRemoteClientBaseTest.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8+
#include <future>
89

9-
#include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h"
1010
#include "GDBRemoteTestUtils.h"
11+
1112
#include "Plugins/Process/Utility/LinuxSignals.h"
13+
#include "Plugins/Process/gdb-remote/GDBRemoteClientBase.h"
1214
#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
1315
#include "lldb/Utility/GDBRemote.h"
14-
#include "lldb/Utility/Listener.h"
15-
#include "llvm/ADT/StringRef.h"
16+
#include "llvm/ADT/STLExtras.h"
1617
#include "llvm/Testing/Support/Error.h"
17-
#include "gtest/gtest.h"
18-
#include <chrono>
19-
#include <future>
20-
#include <string>
21-
#include <vector>
2218

2319
using namespace lldb_private::process_gdb_remote;
2420
using namespace lldb_private;

0 commit comments

Comments
 (0)