[Lldb-commits] [lldb] r227933 - Fix TestThreadStepOut on Linux with LLGS

[Chaoren Lin]

Author: chaoren
Date: Mon Feb  2 19:51:56 2015
New Revision: 227933

URL: http://llvm.org/viewvc/llvm-project?rev=227933&view=rev
Log:
Fix TestThreadStepOut on Linux with LLGS

Remove implicit stop action on $vCont package for threads where no
explicit action or default action specified based on the specification
(they have to stay in there original state).

Modified:
    lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=227933&r1=227932&r2=227933&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original)
+++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Mon Feb  2 19:51:56 2015
@@ -2584,7 +2584,14 @@ NativeProcessLinux::Resume (const Resume
             assert (thread_sp && "thread list should not contain NULL threads");
 
             const ResumeAction *const action = resume_actions.GetActionForThread (thread_sp->GetID (), true);
-            assert (action && "NULL ResumeAction returned for thread during Resume ()");
+
+            if (action == nullptr)
+            {
+                if (log)
+                    log->Printf ("NativeProcessLinux::%s no action specified for pid %" PRIu64 " tid %" PRIu64,
+                        __FUNCTION__, GetID (), thread_sp->GetID ());
+                continue;
+            }
 
             if (log)
             {

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp?rev=227933&r1=227932&r2=227933&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp Mon Feb  2 19:51:56 2015
@@ -2530,10 +2530,6 @@ GDBRemoteCommunicationServer::Handle_vCo
         thread_actions.Append (thread_action);
     }
 
-    // If a default action for all other threads wasn't mentioned
-    // then we should stop the threads.
-    thread_actions.SetDefaultThreadActionIfNeeded (eStateStopped, 0);
-
     Error error = m_debugged_process_sp->Resume (thread_actions);
     if (error.Fail ())
     {