Skip to content

Commit ca68200

Browse files
committed
[lldb] Fix ThreadPlanStepThroughGenericTrampoline
With the rework upstream of step plans, NextRangeBreakpointExplainsStop was made stateless so the check if the break breakpoints needs to be cleared needs to be moved to the ShoudStop method. rdar://159531057 rdar://159675204
1 parent 0a25acc commit ca68200

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ bool ThreadPlanStepThroughGenericTrampoline::ShouldStop(Event *event_ptr) {
9999
s.GetData());
100100
}
101101

102+
ClearNextBranchBreakpointExplainedStop();
103+
102104
if (IsPlanComplete())
103105
return true;
104106

lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from lldbsuite.test.lldbtest import *
88
from lldbsuite.test import lldbutil
99

10-
@skipIf(bugnumber = "rdar://160698178")
1110
class TestTrampoline(TestBase):
1211
def setup(self, bkpt_str):
1312
self.build()
@@ -101,4 +100,4 @@ def test_unused_target(self):
101100
thread.StepInto()
102101
name = thread.frames[0].GetFunctionName()
103102
self.assertIn('unused_target', name)
104-
103+

lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from lldbsuite.test.lldbtest import *
66
from lldbsuite.test.decorators import *
77

8-
@skipIf(bugnumber="rdar://159531057")
98
class TestSwiftBackwardInteropStepping(TestBase):
109

1110
def setup(self, bkpt_str):

0 commit comments

Comments
 (0)