Merge pull request #11427 from felipepiovezan/felipe/stepout_fixes

[lldb] Fix ThreadPlanStepOut when returning from trampolines

Author: felipepiovezan

lldb/source/Target/ThreadPlanStepOut.cpp

@@ -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);
   }

lldb/test/API/lang/swift/step_into_objc_interop_init/TestStepIntoObjCInteropInit.py

@@ -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":

lldb/test/API/lang/swift/step_through_allocating_init/TestStepThroughAllocatingInit.py

@@ -5,7 +5,6 @@
 import os
 import platform
 
-@skipIf(bugnumber ="rdar://159531310")
 class TestStepThroughAllocatingInit(lldbtest.TestBase):
     mydir = lldbtest.TestBase.compute_mydir(__file__)
 

lldb/test/API/lang/swift/stepping/TestSwiftStepping.py

@@ -19,7 +19,6 @@
 import os
 import platform
 
-@skipIf(bugnumber="rdar://159531088")
 class TestSwiftStepping(lldbtest.TestBase):
 
     mydir = lldbtest.TestBase.compute_mydir(__file__)