Skip to content

[lldb] Fix ThreadPlanStepThroughGenericTrampoline #11597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2025
Merged

[lldb] Fix ThreadPlanStepThroughGenericTrampoline #11597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ bool ThreadPlanStepThroughGenericTrampoline::ShouldStop(Event *event_ptr) {
s.GetData());
}

ClearNextBranchBreakpointExplainedStop();

if (IsPlanComplete())
return true;

Expand Down
3 changes: 1 addition & 2 deletions lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil

@skipIf(bugnumber = "rdar://160698178")
class TestTrampoline(TestBase):
def setup(self, bkpt_str):
self.build()
Expand Down Expand Up @@ -101,4 +100,4 @@ def test_unused_target(self):
thread.StepInto()
name = thread.frames[0].GetFunctionName()
self.assertIn('unused_target', name)

1 change: 0 additions & 1 deletion lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from lldbsuite.test.lldbtest import *
from lldbsuite.test.decorators import *

@skipIf(bugnumber="rdar://159531057")
class TestSwiftBackwardInteropStepping(TestBase):

def setup(self, bkpt_str):
Expand Down