Skip to content

[lldb] Fix ThreadPlanStepOut when returning from trampolines #11427

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
Sep 17, 2025
Merged

[lldb] Fix ThreadPlanStepOut when returning from trampolines #11427

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
4 changes: 3 additions & 1 deletion lldb/source/Target/ThreadPlanStepOut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,10 @@ bool ThreadPlanStepOut::ShouldStop(Event *event_ptr) {
else
return m_step_through_inline_plan_sp->ShouldStop(event_ptr);
} else if (m_step_out_further_plan_sp) {
if (m_step_out_further_plan_sp->MischiefManaged())
if (m_step_out_further_plan_sp->MischiefManaged()) {
m_step_out_further_plan_sp.reset();
done = true;
}
else
return m_step_out_further_plan_sp->ShouldStop(event_ptr);
}
Expand Down
1 change: 0 additions & 1 deletion lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from lldbsuite.test.decorators import *
import lldbsuite.test.lldbutil as lldbutil

@skipIf(bugnumber = "rdar://159531304")
class TestSwiftObjcProtocol(TestBase):
def skip_debug_info_libraries(self):
if platform.system() == "Darwin":
Expand Down
1 change: 0 additions & 1 deletion lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import os
import platform

@skipIf(bugnumber ="rdar://159531310")
class TestStepThroughAllocatingInit(lldbtest.TestBase):
mydir = lldbtest.TestBase.compute_mydir(__file__)

Expand Down
1 change: 0 additions & 1 deletion lldb/test/API/lang/swift/stepping/TestSwiftStepping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import os
import platform

@skipIf(bugnumber="rdar://159531088")
class TestSwiftStepping(lldbtest.TestBase):

mydir = lldbtest.TestBase.compute_mydir(__file__)
Expand Down