diff --git a/lldb/source/Target/ThreadPlanStepInstruction.cpp b/lldb/source/Target/ThreadPlanStepInstruction.cpp
--- a/lldb/source/Target/ThreadPlanStepInstruction.cpp
+++ b/lldb/source/Target/ThreadPlanStepInstruction.cpp
@@ -217,19 +217,16 @@
       }
     }
   } else {
-    lldb::addr_t pc_addr = thread.GetRegisterContext()->GetPC(0);
-    if (pc_addr != m_instruction_addr) {
-      if (--m_iteration_count <= 0) {
-        SetPlanComplete();
-        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.
-        SetUpState();
-        return false;
-      }
-    } else
+    if (--m_iteration_count <= 0) {
+      SetPlanComplete();
+      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.
+      SetUpState();
       return false;
+    }
+    return false;
   }
 }