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.
llvm-svn: 360407
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
index 1698c0d0..aa0e0a7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
@@ -17,7 +17,6 @@
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()
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
index 3e2b9a7..d470d47 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
@@ -52,7 +52,6 @@
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.
diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp
index b1ec003..af7cf82 100644
--- a/lldb/source/Core/Disassembler.cpp
+++ b/lldb/source/Core/Disassembler.cpp
@@ -1095,8 +1095,8 @@
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;
}
