Skip to content

Revert "[lldb] Make sure the process is stopped when computing the symbol context (#134757)" #135408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2025

Conversation

JDevlieghere
Copy link
Member

This reverts commit e84a804 because on Linux there seems to be a race around GetRunLock. See #134757 for more context.

…mbol context (llvm#134757)"

This reverts commit e84a804 because on
Linux there seems to be a race around GetRunLock.
@llvmbot llvmbot added the lldb label Apr 11, 2025
@llvmbot
Copy link
Member

llvmbot commented Apr 11, 2025

@llvm/pr-subscribers-lldb

Author: Jonas Devlieghere (JDevlieghere)

Changes

This reverts commit e84a804 because on Linux there seems to be a race around GetRunLock. See #134757 for more context.


Full diff: https://github.com/llvm/llvm-project/pull/135408.diff

1 Files Affected:

  • (modified) lldb/source/Core/Statusline.cpp (+2-10)
diff --git a/lldb/source/Core/Statusline.cpp b/lldb/source/Core/Statusline.cpp
index e14691e2538a2..ed5308ef53eb0 100644
--- a/lldb/source/Core/Statusline.cpp
+++ b/lldb/source/Core/Statusline.cpp
@@ -12,7 +12,6 @@
 #include "lldb/Host/StreamFile.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Target/Process.h"
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Utility/AnsiTerminal.h"
 #include "lldb/Utility/StreamString.h"
@@ -135,15 +134,8 @@ void Statusline::Redraw(bool update) {
     exe_ctx.SetTargetPtr(&m_debugger.GetSelectedOrDummyTarget());
 
   SymbolContext symbol_ctx;
-  if (ProcessSP process_sp = exe_ctx.GetProcessSP()) {
-    // Check if the process is stopped, and if it is, make sure it remains
-    // stopped until we've computed the symbol context.
-    Process::StopLocker stop_locker;
-    if (stop_locker.TryLock(&process_sp->GetRunLock())) {
-      if (auto frame_sp = exe_ctx.GetFrameSP())
-        symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
-    }
-  }
+  if (auto frame_sp = exe_ctx.GetFrameSP())
+    symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
 
   StreamString stream;
   if (auto *format = m_debugger.GetStatuslineFormat())

@JDevlieghere JDevlieghere merged commit 179d30f into llvm:main Apr 11, 2025
12 checks passed
@JDevlieghere JDevlieghere deleted the revert-134757 branch April 11, 2025 18:50
var-const pushed a commit to ldionne/llvm-project that referenced this pull request Apr 17, 2025
…mbol context (llvm#134757)" (llvm#135408)

This reverts commit e84a804 because on
Linux there seems to be a race around GetRunLock. See llvm#134757 for more
context.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants