[Lldb-commits] [lldb] r187434 - Send a stop event when an expression stops at a breakpoint

[Sean Callanan]

Author: spyffe
Date: Tue Jul 30 14:54:09 2013
New Revision: 187434

URL: http://llvm.org/viewvc/llvm-project?rev=187434&view=rev
Log:
Send a stop event when an expression stops at a breakpoint
in an expression and doesn't ignore the stop.

Patch by Jim Ingham.

<rdar://problem/14583884>

Modified:
    lldb/trunk/source/Commands/CommandObjectExpression.cpp
    lldb/trunk/source/Target/Process.cpp

Modified: lldb/trunk/source/Commands/CommandObjectExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectExpression.cpp?rev=187434&r1=187433&r2=187434&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectExpression.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectExpression.cpp Tue Jul 30 14:54:09 2013
@@ -345,36 +345,7 @@ CommandObjectExpression::EvaluateExpress
                                                   exe_ctx.GetFramePtr(),
                                                   result_valobj_sp,
                                                   options);
-        
-        if ((exe_results == eExecutionInterrupted && !m_command_options.unwind_on_error)
-            ||(exe_results == eExecutionHitBreakpoint && !m_command_options.ignore_breakpoints))
-        {
-            uint32_t start_frame = 0;
-            uint32_t num_frames = 1;
-            uint32_t num_frames_with_source = 0;
-            Thread *thread = exe_ctx.GetThreadPtr();
-            if (thread)
-            {
-                thread->GetStatus (result->GetOutputStream(), 
-                                   start_frame, 
-                                   num_frames, 
-                                   num_frames_with_source);
-            }
-            else 
-            {
-                Process *process = exe_ctx.GetProcessPtr();
-                if (process)
-                {
-                    bool only_threads_with_stop_reason = true;
-                    process->GetThreadStatus (result->GetOutputStream(), 
-                                              only_threads_with_stop_reason, 
-                                              start_frame, 
-                                              num_frames, 
-                                              num_frames_with_source);
-                }
-            }
-        }
-        
+
         if (result_valobj_sp)
         {
             Format format = m_format_options.GetFormat();

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=187434&r1=187433&r2=187434&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Jul 30 14:54:09 2013
@@ -5030,11 +5030,17 @@ Process::RunThreadPlan (ExecutionContext
                                                 if (log)
                                                     log->Printf ("Process::RunThreadPlan() stopped for breakpoint: %s.", stop_info_sp->GetDescription());
                                                 return_value = eExecutionHitBreakpoint;
+                                                if (!ignore_breakpoints)
+                                                {
+                                                    event_to_broadcast_sp = event_sp;
+                                                }
                                             }
                                             else
                                             {
                                                 if (log)
                                                     log->PutCString ("Process::RunThreadPlan(): thread plan didn't successfully complete.");
+                                                if (!unwind_on_error)
+                                                    event_to_broadcast_sp = event_sp;
                                                 return_value = eExecutionInterrupted;
                                             }
                                         }