This is an archive of the discontinued LLVM Phabricator instance.

Differential D65640

Update LLDB to follow changes in llvm::DWARFDebugNames::NameIndex (4/5)
ClosedPublic

Authored by ikudrin on Aug 2 2019, 2:10 AM.

Details

Reviewers
dblaikie
probinson
aprantl
clayborg
labath
Commits
rG0be738895c93: Update LLDB to follow changes in llvm::DWARFDebugNames::NameIndex (4/5)
rL368033: Update LLDB to follow changes in llvm::DWARFDebugNames::NameIndex (4/5)
rLLDB368033: Update LLDB to follow changes in llvm::DWARFDebugNames::NameIndex (4/5)

Diff Detail

Repository
rL LLVM

Event Timeline

ikudrin created this revision.Aug 2 2019, 2:10 AM
Herald added a subscriber: arphaman. · View Herald TranscriptAug 2 2019, 2:10 AM
ikudrin added a parent revision: D65638: Switch LLVM to use 64-bit offsets (2/5).Aug 2 2019, 2:10 AM
ikudrin added a child revision: D65641: Remove support for 32-bit offsets in utility classes (5/5).Aug 2 2019, 2:14 AM
labath accepted this revision.Aug 2 2019, 2:23 AM
This revision is now accepted and ready to land.Aug 2 2019, 2:23 AM
Closed by commit rL368033: Update LLDB to follow changes in llvm::DWARFDebugNames::NameIndex (4/5) (authored by ikudrin). · Explain WhyAug 6 2019, 6:41 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2019, 6:41 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
source/
Plugins/
SymbolFile/
DWARF/
6 lines

Diff 213596

lldb/trunk/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Linesvoid DebugNamesDWARFIndex::GetGlobalVariables(const RegularExpression &regex,
DIEArray &offsets) { DIEArray &offsets) {
m_fallback.GetGlobalVariables(regex, offsets); m_fallback.GetGlobalVariables(regex, offsets);
for (const DebugNames::NameIndex &ni: *m_debug_names_up) { for (const DebugNames::NameIndex &ni: *m_debug_names_up) {
for (DebugNames::NameTableEntry nte: ni) { for (DebugNames::NameTableEntry nte: ni) {
if (!regex.Execute(nte.getString())) if (!regex.Execute(nte.getString()))
continue; continue;
uint32_t entry_offset = nte.getEntryOffset(); uint64_t entry_offset = nte.getEntryOffset();
llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset); llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset);
for (; entry_or; entry_or = ni.getEntry(&entry_offset)) { for (; entry_or; entry_or = ni.getEntry(&entry_offset)) {
if (entry_or->tag() != DW_TAG_variable) if (entry_or->tag() != DW_TAG_variable)
continue; continue;
Append(*entry_or, offsets); Append(*entry_or, offsets);
} }
MaybeLogLookupError(entry_or.takeError(), ni, nte.getString()); MaybeLogLookupError(entry_or.takeError(), ni, nte.getString());
} }
} }
} }
void DebugNamesDWARFIndex::GetGlobalVariables(const DWARFUnit &cu, void DebugNamesDWARFIndex::GetGlobalVariables(const DWARFUnit &cu,
DIEArray &offsets) { DIEArray &offsets) {
m_fallback.GetGlobalVariables(cu, offsets); m_fallback.GetGlobalVariables(cu, offsets);
uint64_t cu_offset = cu.GetOffset(); uint64_t cu_offset = cu.GetOffset();
for (const DebugNames::NameIndex &ni: *m_debug_names_up) { for (const DebugNames::NameIndex &ni: *m_debug_names_up) {
for (DebugNames::NameTableEntry nte: ni) { for (DebugNames::NameTableEntry nte: ni) {
uint32_t entry_offset = nte.getEntryOffset(); uint64_t entry_offset = nte.getEntryOffset();
llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset); llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset);
for (; entry_or; entry_or = ni.getEntry(&entry_offset)) { for (; entry_or; entry_or = ni.getEntry(&entry_offset)) {
if (entry_or->tag() != DW_TAG_variable) if (entry_or->tag() != DW_TAG_variable)
continue; continue;
if (entry_or->getCUOffset() != cu_offset) if (entry_or->getCUOffset() != cu_offset)
continue; continue;
Append(*entry_or, offsets); Append(*entry_or, offsets);
▲ Show 20 Lines • Show All 106 Lines • ▼ Show 20 Linesvoid DebugNamesDWARFIndex::GetFunctions(const RegularExpression &regex,
DIEArray &offsets) { DIEArray &offsets) {
m_fallback.GetFunctions(regex, offsets); m_fallback.GetFunctions(regex, offsets);
for (const DebugNames::NameIndex &ni: *m_debug_names_up) { for (const DebugNames::NameIndex &ni: *m_debug_names_up) {
for (DebugNames::NameTableEntry nte: ni) { for (DebugNames::NameTableEntry nte: ni) {
if (!regex.Execute(nte.getString())) if (!regex.Execute(nte.getString()))
continue; continue;
uint32_t entry_offset = nte.getEntryOffset(); uint64_t entry_offset = nte.getEntryOffset();
llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset); llvm::Expected<DebugNames::Entry> entry_or = ni.getEntry(&entry_offset);
for (; entry_or; entry_or = ni.getEntry(&entry_offset)) { for (; entry_or; entry_or = ni.getEntry(&entry_offset)) {
Tag tag = entry_or->tag(); Tag tag = entry_or->tag();
if (tag != DW_TAG_subprogram && tag != DW_TAG_inlined_subroutine) if (tag != DW_TAG_subprogram && tag != DW_TAG_inlined_subroutine)
continue; continue;
Append(*entry_or, offsets); Append(*entry_or, offsets);
} }
Show All 13 Lines