Vendor import of lldb trunk r338150:vendor/lldb/lldb-trunk-r338150

https://llvm.org/svn/llvm-project/lldb/trunk@338150

1 files changed, 10 insertions, 14 deletions

diff --git a/source/Target/ThreadPlanStepInstruction.cpp b/source/Target/ThreadPlanStepInstruction.cpp
index ca45960e1ed5..dd8f129a935b 100644
--- a/source/Target/ThreadPlanStepInstruction.cpp
+++ b/source/Target/ThreadPlanStepInstruction.cpp
@@ -76,8 +76,8 @@ void ThreadPlanStepInstruction::GetDescription(Stream *s,
 }
 
 bool ThreadPlanStepInstruction::ValidatePlan(Stream *error) {
-  // Since we read the instruction we're stepping over from the thread,
-  // this plan will always work.
+  // Since we read the instruction we're stepping over from the thread, this
+  // plan will always work.
   return true;
 }
 
@@ -106,8 +106,8 @@ bool ThreadPlanStepInstruction::IsPlanStale() {
     return (m_thread.GetRegisterContext()->GetPC(0) != m_instruction_addr);
   } else if (cur_frame_id < m_stack_id) {
     // If the current frame is younger than the start frame and we are stepping
-    // over, then we need to continue,
-    // but if we are doing just one step, we're done.
+    // over, then we need to continue, but if we are doing just one step, we're
+    // done.
     return !m_step_over;
   } else {
     if (log) {
@@ -140,8 +140,7 @@ bool ThreadPlanStepInstruction::ShouldStop(Event *event_ptr) {
           return true;
         } else {
           // We are still stepping, reset the start pc, and in case we've
-          // stepped out,
-          // reset the current stack id.
+          // stepped out, reset the current stack id.
           SetUpState();
           return false;
         }
@@ -154,9 +153,8 @@ bool ThreadPlanStepInstruction::ShouldStop(Event *event_ptr) {
         if (return_frame->GetStackID() != m_parent_frame_id ||
             m_start_has_symbol) {
           // next-instruction shouldn't step out of inlined functions.  But we
-          // may have stepped into a
-          // real function that starts with an inlined function, and we do want
-          // to step out of that...
+          // may have stepped into a real function that starts with an inlined
+          // function, and we do want to step out of that...
 
           if (cur_frame_sp->IsInlined()) {
             StackFrameSP parent_frame_sp =
@@ -190,9 +188,8 @@ bool ThreadPlanStepInstruction::ShouldStop(Event *event_ptr) {
             log->Printf("%s.", s.GetData());
           }
 
-          // StepInstruction should probably have the tri-state RunMode, but for
-          // now it is safer to
-          // run others.
+          // StepInstruction should probably have the tri-state RunMode, but
+          // for now it is safer to run others.
           const bool stop_others = false;
           m_thread.QueueThreadPlanForStepOutNoShouldStop(
               false, nullptr, true, stop_others, eVoteNo, eVoteNoOpinion, 0);
@@ -222,8 +219,7 @@ bool ThreadPlanStepInstruction::ShouldStop(Event *event_ptr) {
         return true;
       } else {
         // We are still stepping, reset the start pc, and in case we've stepped
-        // in or out,
-        // reset the current stack id.
+        // in or out, reset the current stack id.
         SetUpState();
         return false;
       }