diff options
3 files changed, 2 insertions, 4 deletions
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 1698c0d0c35..aa0e0a7a681 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 @@ 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() 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 3e2b9a74087..d470d47b60b 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 @@ 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. diff --git a/lldb/source/Core/Disassembler.cpp b/lldb/source/Core/Disassembler.cpp index b1ec003b33a..af7cf82d470 100644 --- a/lldb/source/Core/Disassembler.cpp +++ b/lldb/source/Core/Disassembler.cpp @@ -1095,8 +1095,8 @@ InstructionList::GetIndexOfNextBranchInstruction(uint32_t start, 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; } |
