Revert "Another little stepping optimization: if any of the source step commands are running through a range "

- Revert because this commit introduce several failures in lldb test suite
- http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-cmake/builds/8391
- This reverts commit 78943bb678c2893703ee4e8b41969372740c8a6f.

llvm-svn: 252980

1 files changed, 2 insertions, 9 deletions

diff --git a/lldb/source/Target/ThreadPlanStepRange.cpp b/lldb/source/Target/ThreadPlanStepRange.cpp
index 8618b9245e1..8ccbb97df8f 100644
--- a/lldb/source/Target/ThreadPlanStepRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepRange.cpp
@@ -390,19 +390,12 @@ ThreadPlanStepRange::SetNextBranchBreakpoint ()
         if (branch_index == UINT32_MAX)
         {
             branch_index = instructions->GetSize() - 1;
-            InstructionSP last_inst = instructions->GetInstructionAtIndex(branch_index);
-            size_t last_inst_size = last_inst->GetOpcode().GetByteSize();
-            run_to_address = last_inst->GetAddress();
-            run_to_address.Slide(last_inst_size);
-        }
-        else if (branch_index - pc_index > 1)
-        {
-            run_to_address = instructions->GetInstructionAtIndex(branch_index)->GetAddress();
         }
         
-        if (run_to_address.IsValid())
+        if (branch_index - pc_index > 1)
         {
             const bool is_internal = true;
+            run_to_address = instructions->GetInstructionAtIndex(branch_index)->GetAddress();
             m_next_branch_bp_sp = GetTarget().CreateBreakpoint(run_to_address, is_internal, false);
             if (m_next_branch_bp_sp)
             {