Skip to content

Commit e20a020

Browse files
committed
Revert "Manual DWARF index: don't skip over -gmodules debug info"
This reverts commit a816b65.
1 parent eaadce4 commit e20a020

File tree

3 files changed

+6
-32
lines changed

3 files changed

+6
-32
lines changed

lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -161,27 +161,24 @@ void ManualDWARFIndex::IndexUnit(DWARFUnit &unit, SymbolFileDWARFDwo *dwp,
161161
// though as some functions have template parameter types and other things
162162
// that cause extra copies of types to be included, but we should find these
163163
// types in the .dwo file only as methods could have return types removed and
164-
// we don't have to index incomplete types from the skeleton compile unit.
164+
// we don't have to index incomplete types from the skeletone compile unit.
165165
if (unit.GetDWOId()) {
166166
if (SymbolFileDWARFDwo *dwo_symbol_file = unit.GetDwoSymbolFile()) {
167167
// Type units in a dwp file are indexed separately, so we just need to
168-
// process the split unit here. However, if the split unit is in a dwo
169-
// file, then we need to process type units here.
168+
// process the split unit here. However, if the split unit is in a dwo file,
169+
// then we need to process type units here.
170170
if (dwo_symbol_file == dwp) {
171171
IndexUnitImpl(unit.GetNonSkeletonUnit(), cu_language, set);
172172
} else {
173173
DWARFDebugInfo &dwo_info = dwo_symbol_file->DebugInfo();
174174
for (size_t i = 0; i < dwo_info.GetNumUnits(); ++i)
175175
IndexUnitImpl(*dwo_info.GetUnitAtIndex(i), cu_language, set);
176176
}
177-
return;
178177
}
179-
// The unit has a dwo_id, but this isn't a .dwo skeleton unit, so
180-
// the assumption is that this is a file produced by -gmodules and
181-
// that we want to index it.
178+
} else {
179+
// We either have a normal compile unit which we want to index.
180+
IndexUnitImpl(unit, cu_language, set);
182181
}
183-
// We have a normal compile unit which we want to index.
184-
IndexUnitImpl(unit, cu_language, set);
185182
}
186183

187184
void ManualDWARFIndex::IndexUnitImpl(DWARFUnit &unit,

lldb/test/Shell/SymbolFile/DWARF/Inputs/pch.h

Lines changed: 0 additions & 5 deletions
This file was deleted.

lldb/test/Shell/SymbolFile/DWARF/clang-gmodules-type-lookup.c

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)