[lld] [llvm] [Symbolizer] Support for Missing Line Numbers. (PR #82240)
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 29 21:32:00 PDT 2024
================
@@ -1312,32 +1312,52 @@ uint32_t DWARFDebugLine::LineTable::findRowInSeq(
return RowPos - Rows.begin();
}
-uint32_t DWARFDebugLine::LineTable::lookupAddress(
- object::SectionedAddress Address) const {
+std::pair<uint32_t, bool>
+DWARFDebugLine::LineTable::lookupAddress(object::SectionedAddress Address,
+ bool ApproximateLine) const {
// Search for relocatable addresses
- uint32_t Result = lookupAddressImpl(Address);
+ std::pair<uint32_t, bool> Result =
+ lookupAddressImpl(Address, ApproximateLine);
- if (Result != UnknownRowIndex ||
+ if (Result.first != UnknownRowIndex ||
Address.SectionIndex == object::SectionedAddress::UndefSection)
return Result;
// Search for absolute addresses
Address.SectionIndex = object::SectionedAddress::UndefSection;
- return lookupAddressImpl(Address);
+ return lookupAddressImpl(Address, ApproximateLine);
}
-uint32_t DWARFDebugLine::LineTable::lookupAddressImpl(
- object::SectionedAddress Address) const {
+std::pair<uint32_t, bool>
+DWARFDebugLine::LineTable::lookupAddressImpl(object::SectionedAddress Address,
+ bool ApproximateLine) const {
// First, find an instruction sequence containing the given address.
DWARFDebugLine::Sequence Sequence;
Sequence.SectionIndex = Address.SectionIndex;
Sequence.HighPC = Address.Address;
SequenceIter It = llvm::upper_bound(Sequences, Sequence,
DWARFDebugLine::Sequence::orderByHighPC);
if (It == Sequences.end() || It->SectionIndex != Address.SectionIndex)
- return UnknownRowIndex;
- return findRowInSeq(*It, Address);
+ return {UnknownRowIndex, false};
+
+ uint32_t RowIndex = findRowInSeq(*It, Address);
+ bool IsApproximate = false;
+ if (ApproximateLine) {
+ uint32_t ApproxRowIndex = RowIndex;
+ while (ApproxRowIndex >= It->FirstRowIndex) {
+ if (ApproxRowIndex != UnknownRowIndex && Rows[ApproxRowIndex].Line)
----------------
dwblaikie wrote:
I don't think UnknownRowIndex is relevant here - perhaps it should be checked once before the loop, but walking back one row at a time, only while >= FirstRowIndex, shouldn't stumble into unknown row index, right?
https://github.com/llvm/llvm-project/pull/82240
More information about the llvm-commits
mailing list