Skip to content

Commit 73b554d

Browse files
authored
[lldb] Make sure the process is stopped when computing the symbol context (#135458)
Make sure the process is stopped when computing the symbol context. Both Adrian and Felipe reported a handful of crashes in GetSymbolContext called from Statusline::Redraw on the default event thread. Given that we're handling a StackFrameSP, it's not clear to me how that could have gotten invalidated, but Jim points out that it doesn't make sense to compute the symbol context for the frame when the process isn't stopped. Depends on #135455
1 parent d792094 commit 73b554d

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

lldb/source/Core/Statusline.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "lldb/Host/StreamFile.h"
1313
#include "lldb/Interpreter/CommandInterpreter.h"
1414
#include "lldb/Symbol/SymbolContext.h"
15+
#include "lldb/Target/Process.h"
1516
#include "lldb/Target/StackFrame.h"
1617
#include "lldb/Utility/AnsiTerminal.h"
1718
#include "lldb/Utility/StreamString.h"
@@ -134,8 +135,15 @@ void Statusline::Redraw(bool update) {
134135
exe_ctx.SetTargetPtr(&m_debugger.GetSelectedOrDummyTarget());
135136

136137
SymbolContext symbol_ctx;
137-
if (auto frame_sp = exe_ctx.GetFrameSP())
138-
symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
138+
if (ProcessSP process_sp = exe_ctx.GetProcessSP()) {
139+
// Check if the process is stopped, and if it is, make sure it remains
140+
// stopped until we've computed the symbol context.
141+
Process::StopLocker stop_locker;
142+
if (stop_locker.TryLock(&process_sp->GetRunLock())) {
143+
if (auto frame_sp = exe_ctx.GetFrameSP())
144+
symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
145+
}
146+
}
139147

140148
StreamString stream;
141149
if (auto *format = m_debugger.GetStatuslineFormat())

0 commit comments

Comments
 (0)