From: Jim Ingham <jingham@apple.com>
Date: Tue, 26 Jul 2016 19:50:25 +0000 (+0000)
Subject: The ARM single-step handling needs to look for breakpoint on the next instruction.
X-Git-Tag: llvmorg-4.0.0-rc1~14143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75c450466d7d66cb60c62c8a23cb7643a442c448;p=platform%2Fupstream%2Fllvm.git

The ARM single-step handling needs to look for breakpoint on the next instruction.

<rdar://problem/27006685>

llvm-svn: 276796
---

diff --git a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp
index 7c0487b..6331e81 100644
--- a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp
+++ b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp
@@ -450,7 +450,8 @@ StopInfoMachException::CreateStopReasonWithMachException
                     if (exc_code == 1 && exc_sub_code == 0) // EXC_ARM_BREAKPOINT
                     {
                         // This is hit when we single instruction step aka MDSCR_EL1 SS bit 0 is set
-                        return StopInfo::CreateStopReasonToTrace(thread);
+                        is_actual_breakpoint = false;
+                        is_trace_if_actual_breakpoint_missing = true;
                     }
                     if (exc_code == 0x102) // EXC_ARM_DA_DEBUG
                     {