Some code that is sanity checking stepping out back out from one inlined
frame to another was triggering an early stop when stepping back out to a
real frame. Check that we're doing this only for inlined frames.
<rdar://problem/26482931>
llvm-svn: 277185
diff --git a/lldb/source/Target/ThreadPlanStepOverRange.cpp b/lldb/source/Target/ThreadPlanStepOverRange.cpp
index 95dc220..0d02531 100644
--- a/lldb/source/Target/ThreadPlanStepOverRange.cpp
+++ b/lldb/source/Target/ThreadPlanStepOverRange.cpp
@@ -118,6 +118,12 @@
{
if (m_addr_context.function && m_addr_context.function == context.function)
{
+ // It is okay to return to a different block of a straight function, we only have to
+ // be more careful if returning from one inlined block to another.
+ if (m_addr_context.block->GetInlinedFunctionInfo() == nullptr
+ && context.block->GetInlinedFunctionInfo() == nullptr)
+ return true;
+
if (m_addr_context.block && m_addr_context.block == context.block)
return true;
}