[Lldb-commits] [lldb] r360407 - Revert "Disable the step over skipping calls feature since buildbots are not happy."

[Pavel Labath via lldb-commits]

Author: labath
Date: Thu May  9 23:57:25 2019
New Revision: 360407

URL: http://llvm.org/viewvc/llvm-project?rev=360407&view=rev
Log:
Revert "Disable the step over skipping calls feature since buildbots are not happy."

While this fixed the windows bot failures, it also broke all other bots.

Upon closer inspection, it turns out that the windows bots were "broken"
because two tests were unexpectedly passing -- i.e., the original patch
(r360375) actually improved our stepping support on windows.

So instead, I remove the relevant XFAILs.

This reverts commit r360397.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
    lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
    lldb/trunk/source/Core/Disassembler.cpp

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py?rev=360407&r1=360406&r2=360407&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py Thu May  9 23:57:25 2019
@@ -17,7 +17,6 @@ class CmdPythonTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
     NO_DEBUG_INFO_TESTCASE = True
 
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr32343")
     def test(self):
         self.build()
         self.pycmd_tests()

Modified: lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py?rev=360407&r1=360406&r2=360407&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py Thu May  9 23:57:25 2019
@@ -52,7 +52,6 @@ class ThreadAPITestCase(TestBase):
         self.step_out_of_malloc_into_function_b(self.exe_name)
 
     @add_test_categories(['pyapi'])
-    @expectedFailureAll(oslist=["windows"], bugnumber='llvm.org/pr32343')
     def test_step_over_3_times(self):
         """Test Python SBThread.StepOver() API."""
         # We build a different executable than the default build() does.

Modified: lldb/trunk/source/Core/Disassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Disassembler.cpp?rev=360407&r1=360406&r2=360407&view=diff
==============================================================================
--- lldb/trunk/source/Core/Disassembler.cpp (original)
+++ lldb/trunk/source/Core/Disassembler.cpp Thu May  9 23:57:25 2019
@@ -1095,8 +1095,8 @@ InstructionList::GetIndexOfNextBranchIns
   size_t i;
   for (i = start; i < num_instructions; i++) {
     if (m_instructions[i]->DoesBranch()) {
-//      if (ignore_calls && m_instructions[i]->IsCall())
-//        continue;
+      if (ignore_calls && m_instructions[i]->IsCall())
+        continue;
       next_branch = i;
       break;
     }