From ca682005509be42d69b5aebe37c66ca2de7e1869 Mon Sep 17 00:00:00 2001 From: Augusto Noronha Date: Wed, 8 Oct 2025 14:30:40 -0700 Subject: [PATCH] [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 --- lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp | 2 ++ .../API/lang/c/trampoline_stepping/TestTrampolineStepping.py | 3 +-- .../backward/stepping/TestSwiftBackwardInteropStepping.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp b/lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp index 1638f88e43617..7e20e0d248e83 100644 --- a/lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp +++ b/lldb/source/Target/ThreadPlanStepThroughGenericTrampoline.cpp @@ -99,6 +99,8 @@ bool ThreadPlanStepThroughGenericTrampoline::ShouldStop(Event *event_ptr) { s.GetData()); } + ClearNextBranchBreakpointExplainedStop(); + if (IsPlanComplete()) return true; diff --git a/lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py b/lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py index 1185c3bf87ad3..db46c4ef83459 100644 --- a/lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py +++ b/lldb/test/API/lang/c/trampoline_stepping/TestTrampolineStepping.py @@ -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() @@ -101,4 +100,4 @@ def test_unused_target(self): thread.StepInto() name = thread.frames[0].GetFunctionName() self.assertIn('unused_target', name) - + diff --git a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py index 61acccbb095d9..18c30faa6a765 100644 --- a/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py +++ b/lldb/test/API/lang/swift/cxx_interop/backward/stepping/TestSwiftBackwardInteropStepping.py @@ -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):