intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-16 05:32:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb] Fix thread step until to not set breakpoint(s) on incorrect line numbers

Browse Source 
The requirements for "thread until <line number>" are:

a) If any code contributed by <line number> or the nearest subsequent of <line number> is executed before leaving the function, stop
b) If you end up leaving the function w/o triggering (a), then stop

In case of (a), since the <line number> may have multiple entries in the line table and the compiler might have scheduled/moved the relevant code across, and the lldb does not know the control flow, set breakpoints on all the line table entries of best match of <line number> i.e. exact or the nearest subsequent line.

Along with the above, currently, CommandObjectThreadUntil is also setting the breakpoints on all the subsequent line numbers after the best match and this latter part is wrong.

This issue is discussed at http://lists.llvm.org/pipermail/lldb-dev/2018-August/013979.html.

In fact, currently `TestStepUntil.py` is not actually testing step until scenarios and `test_missing_one` test fails without this patch if tests are made to run. Fixed the test as well.

Reviewed By: jingham

Differential Revision: https://reviews.llvm.org/D50304
This commit is contained in:
Venkata Ramanaiah Nalamothu
2022-06-02 23:19:30 +05:30
parent 4817b7729a
commit a57b62deef
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lldb/source/Commands/CommandObjectThread.cpp
View File

@@ -1033,11 +1033,21 @@ 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)