[Lldb-commits] [PATCH] D80112: Check if thread was suspended during previous stop added.

[Ilya Bukonkin via Phabricator via lldb-commits]

fallkrum updated this revision to Diff 264576.
fallkrum added a reviewer: LLDB.
fallkrum removed a subscriber: lldb-commits.

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D80112/new/

https://reviews.llvm.org/D80112

Files:
  lldb/source/Target/Thread.cpp


Index: lldb/source/Target/Thread.cpp
===================================================================
--- lldb/source/Target/Thread.cpp
+++ lldb/source/Target/Thread.cpp
@@ -378,7 +378,9 @@
     const uint32_t process_stop_id = process_sp->GetStopID();
     if (m_stop_info_stop_id != process_stop_id) {
       if (m_stop_info_sp) {
-        if (m_stop_info_sp->IsValid() || IsStillAtLastBreakpointHit() ||
+        if (m_stop_info_sp->IsValid() ||
+            (IsStillAtLastBreakpointHit() &&
+             m_resume_state != eStateSuspended) ||
             GetCurrentPlan()->IsVirtualStep())
           SetStopInfo(m_stop_info_sp);
         else



Index: lldb/source/Target/Thread.cpp
===================================================================
--- lldb/source/Target/Thread.cpp
+++ lldb/source/Target/Thread.cpp
@@ -378,7 +378,9 @@
     const uint32_t process_stop_id = process_sp->GetStopID();
     if (m_stop_info_stop_id != process_stop_id) {
       if (m_stop_info_sp) {
-        if (m_stop_info_sp->IsValid() || IsStillAtLastBreakpointHit() ||
+        if (m_stop_info_sp->IsValid() ||
+            (IsStillAtLastBreakpointHit() &&
+             m_resume_state != eStateSuspended) ||
             GetCurrentPlan()->IsVirtualStep())
           SetStopInfo(m_stop_info_sp);
         else

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits