Author: Jonas Devlieghere Date: 2026-06-22T23:53:11Z New Revision: 2d0b2fb0e0d8fa198be51096923675de9a564f83
URL: https://github.com/llvm/llvm-project/commit/2d0b2fb0e0d8fa198be51096923675de9a564f83 DIFF: https://github.com/llvm/llvm-project/commit/2d0b2fb0e0d8fa198be51096923675de9a564f83.diff LOG: Revert "[lldb][Windows] Remember server's primary stop thread on gdb-remote stops" (#205220) Reverts llvm/llvm-project#203525 because it breaks TestRealDefinition.py Added: Modified: lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h Removed: ################################################################################ diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 85b9516a416fb..a986d0350bf57 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -2636,8 +2636,6 @@ StateType ProcessGDBRemote::SetThreadStopInfo(StringExtractor &stop_packet) { SetAddressableBitMasks(addressable_bits); - m_last_stop_primary_tid = tid; - ThreadSP thread_sp = SetThreadStopInfo( tid, expedited_register_map, signo, thread_name, reason, description, exc_type, exc_data, thread_dispatch_qaddr, queue_vars_valid, @@ -2686,14 +2684,7 @@ void ProcessGDBRemote::RefreshStateAfterStop() { if (m_initial_tid != LLDB_INVALID_THREAD_ID) { m_thread_list.SetSelectedThreadByID(m_initial_tid); m_initial_tid = LLDB_INVALID_THREAD_ID; - } else if (m_last_stop_primary_tid != LLDB_INVALID_THREAD_ID && - StateIsRunningState(m_last_broadcast_state)) { - if (ThreadSP primary_thread_sp = - m_thread_list.FindThreadByProtocolID(m_last_stop_primary_tid, - /*can_update=*/false)) - m_thread_list.SetSelectedThreadByID(primary_thread_sp->GetID()); - } - m_last_stop_primary_tid = LLDB_INVALID_THREAD_ID; + } // Let all threads recover from stopping and do any clean up based on the // previous thread state (if any). diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h index 7a030cd966a18..0a3386082c388 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -322,9 +322,6 @@ class ProcessGDBRemote : public Process, lldb::CommandObjectSP m_command_sp; int64_t m_breakpoint_pc_offset; lldb::tid_t m_initial_tid; // The initial thread ID, given by stub on attach - lldb::tid_t m_last_stop_primary_tid = - LLDB_INVALID_THREAD_ID; // Thread ID extracted from the most recent - // T-packet's "thread:<tid>" key. bool m_use_g_packet_for_reading; bool m_allow_flash_writes; _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
