Skip to content

Commit b590e9a

Browse files
authored
[lldb] Remove Listener::SetShadow (#97555)
It's not used since https://reviews.llvm.org/D157556.
1 parent 5ce9a86 commit b590e9a

File tree

4 files changed

+7
-28
lines changed

4 files changed

+7
-28
lines changed

lldb/include/lldb/Utility/Listener.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ class Listener : public std::enable_shared_from_this<Listener> {
9494

9595
size_t HandleBroadcastEvent(lldb::EventSP &event_sp);
9696

97-
void SetShadow(bool is_shadow) { m_is_shadow = is_shadow; }
98-
9997
private:
10098
// Classes that inherit from Listener can see and modify these
10199
struct BroadcasterInfo {
@@ -132,7 +130,6 @@ class Listener : public std::enable_shared_from_this<Listener> {
132130
std::mutex m_events_mutex; // Protects m_broadcasters and m_events
133131
std::condition_variable m_events_condition;
134132
broadcaster_manager_collection m_broadcaster_managers;
135-
bool m_is_shadow = false;
136133

137134
void BroadcasterWillDestruct(Broadcaster *);
138135

lldb/source/API/SBAttachInfo.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,7 @@ SBListener SBAttachInfo::GetShadowListener() {
266266
void SBAttachInfo::SetShadowListener(SBListener &listener) {
267267
LLDB_INSTRUMENT_VA(this, listener);
268268

269-
ListenerSP listener_sp = listener.GetSP();
270-
if (listener_sp && listener.IsValid())
271-
listener_sp->SetShadow(true);
272-
else
273-
listener_sp = nullptr;
274-
275-
m_opaque_sp->SetShadowListener(listener_sp);
269+
m_opaque_sp->SetShadowListener(listener.GetSP());
276270
}
277271

278272
const char *SBAttachInfo::GetScriptedProcessClassName() const {

lldb/source/API/SBLaunchInfo.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,5 @@ SBListener SBLaunchInfo::GetShadowListener() {
402402
void SBLaunchInfo::SetShadowListener(SBListener &listener) {
403403
LLDB_INSTRUMENT_VA(this, listener);
404404

405-
ListenerSP listener_sp = listener.GetSP();
406-
if (listener_sp && listener.IsValid())
407-
listener_sp->SetShadow(true);
408-
else
409-
listener_sp = nullptr;
410-
411-
m_opaque_sp->SetShadowListener(listener_sp);
405+
m_opaque_sp->SetShadowListener(listener.GetSP());
412406
}

lldb/source/Utility/Listener.cpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,16 @@
1818
using namespace lldb;
1919
using namespace lldb_private;
2020

21-
Listener::Listener(const char *name)
22-
: m_name(name), m_broadcasters(), m_broadcasters_mutex(), m_events(),
23-
m_events_mutex(), m_is_shadow() {
24-
Log *log = GetLog(LLDBLog::Object);
25-
if (log != nullptr)
26-
LLDB_LOGF(log, "%p Listener::Listener('%s')", static_cast<void *>(this),
27-
m_name.c_str());
21+
Listener::Listener(const char *name) : m_name(name) {
22+
LLDB_LOGF(GetLog(LLDBLog::Object), "%p Listener::Listener('%s')",
23+
static_cast<void *>(this), m_name.c_str());
2824
}
2925

3026
Listener::~Listener() {
31-
Log *log = GetLog(LLDBLog::Object);
32-
3327
// Don't call Clear() from here as that can cause races. See #96750.
3428

35-
LLDB_LOGF(log, "%p Listener::%s('%s')", static_cast<void *>(this),
36-
__FUNCTION__, m_name.c_str());
29+
LLDB_LOGF(GetLog(LLDBLog::Object), "%p Listener::%s('%s')",
30+
static_cast<void *>(this), __FUNCTION__, m_name.c_str());
3731
}
3832

3933
void Listener::Clear() {

0 commit comments

Comments
 (0)