Skip to content

Commit 27d7bed

Browse files
committed
rebase on top of llvm#127806
1 parent c63e16c commit 27d7bed

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

lldb/source/Symbol/Function.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -333,18 +333,12 @@ Function::GetSourceInfo() {
333333

334334
uint32_t end_line = start_line;
335335
for (const AddressRange &range : GetAddressRanges()) {
336-
LineEntry entry;
337-
uint32_t idx;
338-
if (!line_table->FindLineEntryByAddress(range.GetBaseAddress(), entry,
339-
&idx))
340-
continue;
341-
342-
addr_t end_addr =
343-
range.GetBaseAddress().GetFileAddress() + range.GetByteSize();
344-
while (line_table->GetLineEntryAtIndex(idx++, entry) &&
345-
entry.range.GetBaseAddress().GetFileAddress() < end_addr) {
346-
// Ignore entries belonging to inlined functions or #included files.
347-
if (source_file_sp->Equal(*entry.file_sp,
336+
for (auto [idx, end] = line_table->GetLineEntryIndexRange(range); idx < end;
337+
++idx) {
338+
LineEntry entry;
339+
// Ignore entries belonging to inlined functions or #included files.
340+
if (line_table->GetLineEntryAtIndex(idx, entry) &&
341+
source_file_sp->Equal(*entry.file_sp,
348342
SupportFile::eEqualFileSpecAndChecksumIfSet))
349343
end_line = std::max(end_line, entry.line);
350344
}

0 commit comments

Comments
 (0)