From aa3c5d0297e4e5fca2e6316d5430d752122969c9 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Tue, 24 Jun 2025 16:04:58 -0500 Subject: Revert "[lldb][RISCV] fix LR/SC atomic sequence handling in lldb-server" (#145597) Reverts llvm/llvm-project#127505 because `riscv/step/TestSoftwareStep.py` is failing on the bots. --- lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp') diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp index 9c798cb1cc8f..7f2aba0e4eb2 100644 --- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp @@ -833,7 +833,7 @@ void NativeProcessLinux::MonitorBreakpoint(NativeThreadLinux &thread) { auto stepping_with_bp_it = m_threads_stepping_with_breakpoint.find(thread.GetID()); if (stepping_with_bp_it != m_threads_stepping_with_breakpoint.end() && - llvm::is_contained(stepping_with_bp_it->second, reg_ctx.GetPC())) + stepping_with_bp_it->second == reg_ctx.GetPC()) thread.SetStoppedByTrace(); StopRunningThreads(thread.GetID()); @@ -1960,12 +1960,10 @@ void NativeProcessLinux::SignalIfAllThreadsStopped() { // Clear any temporary breakpoints we used to implement software single // stepping. for (const auto &thread_info : m_threads_stepping_with_breakpoint) { - for (auto &&bp_addr : thread_info.second) { - Status error = RemoveBreakpoint(bp_addr); - if (error.Fail()) - LLDB_LOG(log, "pid = {0} remove stepping breakpoint: {1}", - thread_info.first, error); - } + Status error = RemoveBreakpoint(thread_info.second); + if (error.Fail()) + LLDB_LOG(log, "pid = {0} remove stepping breakpoint: {1}", + thread_info.first, error); } m_threads_stepping_with_breakpoint.clear(); -- cgit v1.2.3