From fe6db8d03ff16a65f57af24d2cb04f489e2e9b0c Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Mon, 27 Jun 2022 10:18:39 +0200 Subject: Revert "[lldb] Fix thread step until to not set breakpoint(s) on incorrect line numbers" This reverts commit a57b62deef37c7f2ec31bca3bf9173a6206bfb9b. lldb-aarch64-ubuntu buildbot test fails since https://lab.llvm.org/buildbot/#/builders/96/builds/25128 --- lldb/source/Commands/CommandObjectThread.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'lldb/source/Commands/CommandObjectThread.cpp') diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp index 9396c361..037bbaf 100644 --- a/lldb/source/Commands/CommandObjectThread.cpp +++ b/lldb/source/Commands/CommandObjectThread.cpp @@ -1033,21 +1033,11 @@ protected: line_table->FindLineEntryByAddress(fun_end_addr, function_start, &end_ptr); - // Since not all source lines will contribute code, check if we are - // setting the breakpoint on the exact line number or the nearest - // subsequent line number and set breakpoints at all the line table - // entries of the chosen line number (exact or nearest subsequent). for (uint32_t line_number : line_numbers) { - LineEntry line_entry; - bool exact = false; uint32_t start_idx_ptr = index_ptr; - start_idx_ptr = sc.comp_unit->FindLineEntry( - index_ptr, line_number, nullptr, exact, &line_entry); - if (start_idx_ptr != UINT32_MAX) - line_number = line_entry.line; - exact = true; - start_idx_ptr = index_ptr; while (start_idx_ptr <= end_ptr) { + LineEntry line_entry; + const bool exact = false; start_idx_ptr = sc.comp_unit->FindLineEntry( start_idx_ptr, line_number, nullptr, exact, &line_entry); if (start_idx_ptr == UINT32_MAX) -- cgit v1.1