jankratochvil created this revision.
jankratochvil added reviewers: clayborg, labath, JDevlieghere.
jankratochvil added a project: LLDB.
Herald added subscribers: lldb-commits, jdoerfert, abidh, arphaman, aprantl.
D42892 <https://reviews.llvm.org/D42892> changed a lot of code to use
superclass `DWARFUnit` instead of its subclass `DWARFCompileUnit`.
Finish this change more thoroughly for any `*CompileUnit*`->`*Unit*` names.
Later patch will introduce `DWARFTypeUnit` which needs to be sometimes
different from `DWARFCompileUnit` and it would be confusing without this
renaming.
The whole patchset available for testing as: `git clone -b debugtypes
git://git.jankratochvil.net/lldb`
Repository:
rLLDB LLDB
https://reviews.llvm.org/D61501
Files:
lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
lldb/source/Plugins/SymbolFile/DWARF/DIERef.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp
@@ -56,7 +56,7 @@
DWARFUnit *SymbolFileDWARFDwo::GetCompileUnit() {
// Only dwo files with 1 compile unit is supported
if (GetNumCompileUnits() == 1)
- return DebugInfo()->GetCompileUnitAtIndex(0);
+ return DebugInfo()->GetUnitAtIndex(0);
else
return nullptr;
}
Index: lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -301,13 +301,13 @@
if (dwarf_cu == 0)
return 0;
GetTypes(dwarf_cu->DIE(), dwarf_cu->GetOffset(),
- dwarf_cu->GetNextCompileUnitOffset(), type_mask, type_set);
+ dwarf_cu->GetNextUnitOffset(), type_mask, type_set);
} else {
DWARFDebugInfo *info = DebugInfo();
if (info) {
- const size_t num_cus = info->GetNumCompileUnits();
+ const size_t num_cus = info->GetNumUnits();
for (size_t cu_idx = 0; cu_idx < num_cus; ++cu_idx) {
- dwarf_cu = info->GetCompileUnitAtIndex(cu_idx);
+ dwarf_cu = info->GetUnitAtIndex(cu_idx);
if (dwarf_cu) {
GetTypes(dwarf_cu->DIE(), 0, UINT32_MAX, type_mask, type_set);
}
@@ -693,7 +693,7 @@
// offset itself
DWARFUnit *dwarf_cu =
- info->GetCompileUnit((dw_offset_t)comp_unit->GetID());
+ info->GetUnit((dw_offset_t)comp_unit->GetID());
if (dwarf_cu && dwarf_cu->GetUserData() == NULL)
dwarf_cu->SetUserData(comp_unit);
return dwarf_cu;
@@ -781,7 +781,7 @@
// Figure out the compile unit index if we weren't given one
if (cu_idx == UINT32_MAX)
- DebugInfo()->GetCompileUnit(dwarf_cu->GetOffset(), &cu_idx);
+ DebugInfo()->GetUnit(dwarf_cu->GetOffset(), &cu_idx);
m_obj_file->GetModule()->GetSymbolVendor()->SetCompileUnitAtIndex(
cu_idx, cu_sp);
@@ -797,7 +797,7 @@
uint32_t SymbolFileDWARF::GetNumCompileUnits() {
DWARFDebugInfo *info = DebugInfo();
if (info)
- return info->GetNumCompileUnits();
+ return info->GetNumUnits();
return 0;
}
@@ -806,7 +806,7 @@
CompUnitSP cu_sp;
DWARFDebugInfo *info = DebugInfo();
if (info) {
- DWARFUnit *dwarf_cu = info->GetCompileUnitAtIndex(cu_idx);
+ DWARFUnit *dwarf_cu = info->GetUnitAtIndex(cu_idx);
if (dwarf_cu)
cu_sp = ParseCompileUnit(dwarf_cu, cu_idx);
}
@@ -1599,7 +1599,7 @@
const uint32_t num_compile_units = GetNumCompileUnits();
for (uint32_t cu_idx = 0; cu_idx < num_compile_units; ++cu_idx) {
- DWARFUnit *dwarf_cu = debug_info->GetCompileUnitAtIndex(cu_idx);
+ DWARFUnit *dwarf_cu = debug_info->GetUnitAtIndex(cu_idx);
const DWARFBaseDIE die = dwarf_cu->GetUnitDIEOnly();
if (die && !die.HasChildren()) {
@@ -1764,7 +1764,7 @@
} else {
uint32_t cu_idx = DW_INVALID_INDEX;
DWARFUnit *dwarf_cu =
- debug_info->GetCompileUnit(cu_offset, &cu_idx);
+ debug_info->GetUnit(cu_offset, &cu_idx);
if (dwarf_cu) {
sc.comp_unit = GetCompUnitForDWARFCompUnit(dwarf_cu, cu_idx);
if (sc.comp_unit) {
@@ -1865,7 +1865,7 @@
DWARFUnit *dwarf_cu = NULL;
for (cu_idx = 0;
- (dwarf_cu = debug_info->GetCompileUnitAtIndex(cu_idx)) != NULL;
+ (dwarf_cu = debug_info->GetUnitAtIndex(cu_idx)) != NULL;
++cu_idx) {
CompileUnit *dc_cu = GetCompUnitForDWARFCompUnit(dwarf_cu, cu_idx);
const bool full_match = (bool)file_spec.GetDirectory();
@@ -2354,10 +2354,10 @@
DWARFDebugInfo *info = DebugInfo();
uint32_t num_comp_units = 0;
if (info)
- num_comp_units = info->GetNumCompileUnits();
+ num_comp_units = info->GetNumUnits();
for (uint32_t i = 0; i < num_comp_units; i++) {
- DWARFUnit *cu = info->GetCompileUnitAtIndex(i);
+ DWARFUnit *cu = info->GetUnitAtIndex(i);
if (cu == nullptr)
continue;
@@ -2696,7 +2696,7 @@
DWARFDebugInfo *debug_info = DebugInfo();
const uint32_t num_compile_units = GetNumCompileUnits();
for (uint32_t cu_idx = 0; cu_idx < num_compile_units; ++cu_idx) {
- DWARFUnit *dwarf_cu = debug_info->GetCompileUnitAtIndex(cu_idx);
+ DWARFUnit *dwarf_cu = debug_info->GetUnitAtIndex(cu_idx);
if (dwarf_cu != cu &&
dwarf_cu->Supports_DW_AT_APPLE_objc_complete_type()) {
m_supports_DW_AT_APPLE_objc_complete_type = eLazyBoolYes;
@@ -3121,7 +3121,7 @@
return num_variables;
}
} else if (sc.comp_unit) {
- DWARFUnit *dwarf_cu = info->GetCompileUnit(sc.comp_unit->GetID());
+ DWARFUnit *dwarf_cu = info->GetUnit(sc.comp_unit->GetID());
if (dwarf_cu == NULL)
return 0;
Index: lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp
@@ -32,9 +32,9 @@
Timer scoped_timer(func_cat, "%p", static_cast<void *>(&debug_info));
std::vector<DWARFUnit *> units_to_index;
- units_to_index.reserve(debug_info.GetNumCompileUnits());
- for (size_t U = 0; U < debug_info.GetNumCompileUnits(); ++U) {
- DWARFUnit *unit = debug_info.GetCompileUnitAtIndex(U);
+ units_to_index.reserve(debug_info.GetNumUnits());
+ for (size_t U = 0; U < debug_info.GetNumUnits(); ++U) {
+ DWARFUnit *unit = debug_info.GetUnitAtIndex(U);
if (unit && m_units_to_avoid.count(unit->GetOffset()) == 0)
units_to_index.push_back(unit);
}
@@ -43,8 +43,8 @@
std::vector<IndexSet> sets(units_to_index.size());
- // Keep memory down by clearing DIEs for any compile units if indexing
- // caused us to load the compile unit's DIEs.
+ // Keep memory down by clearing DIEs for any units if indexing
+ // caused us to load the unit's DIEs.
std::vector<llvm::Optional<DWARFUnit::ScopedExtractDIEs>> clear_cu_dies(
units_to_index.size());
auto parser_fn = [&](size_t cu_idx) {
@@ -55,17 +55,17 @@
clear_cu_dies[cu_idx] = units_to_index[cu_idx]->ExtractDIEsScoped();
};
- // Create a task runner that extracts dies for each DWARF compile unit in a
+ // Create a task runner that extracts dies for each DWARF unit in a
// separate thread
- // First figure out which compile units didn't have their DIEs already
+ // First figure out which units didn't have their DIEs already
// parsed and remember this. If no DIEs were parsed prior to this index
// function call, we are going to want to clear the CU dies after we are
// done indexing to make sure we don't pull in all DWARF dies, but we need
- // to wait until all compile units have been indexed in case a DIE in one
- // compile unit refers to another and the indexes accesses those DIEs.
+ // to wait until all units have been indexed in case a DIE in one
+ // unit refers to another and the indexes accesses those DIEs.
TaskMapOverInt(0, units_to_index.size(), extract_fn);
- // Now create a task runner that can index each DWARF compile unit in a
+ // Now create a task runner that can index each DWARF unit in a
// separate thread so we can index quickly.
TaskMapOverInt(0, units_to_index.size(), parser_fn);
@@ -95,7 +95,7 @@
if (log) {
m_module.LogMessage(
- log, "ManualDWARFIndex::IndexUnit for compile unit at .debug_info[0x%8.8x]",
+ log, "ManualDWARFIndex::IndexUnit for unit at .debug_info[0x%8.8x]",
unit.GetOffset());
}
@@ -213,7 +213,7 @@
// if (block_data) {
// uint32_t block_length = form_value.Unsigned();
// if (block_length == 1 +
- // attributes.CompileUnitAtIndex(i)->GetAddressByteSize()) {
+ // attributes.UnitAtIndex(i)->GetAddressByteSize()) {
// if (block_data[0] == DW_OP_addr)
// add_die = true;
// }
Index: lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp
@@ -55,7 +55,7 @@
if (!cu_offset)
return DIERef();
- DWARFUnit *cu = m_debug_info.GetCompileUnit(*cu_offset);
+ DWARFUnit *cu = m_debug_info.GetUnit(*cu_offset);
if (!cu)
return DIERef();
@@ -164,7 +164,7 @@
if (!ref)
continue;
- DWARFUnit *cu = m_debug_info.GetCompileUnit(ref.cu_offset);
+ DWARFUnit *cu = m_debug_info.GetUnit(ref.cu_offset);
if (!cu || !cu->Supports_DW_AT_APPLE_objc_complete_type()) {
incomplete_types.push_back(ref);
continue;
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.h
@@ -85,12 +85,12 @@
bool ContainsDIEOffset(dw_offset_t die_offset) const {
return die_offset >= GetFirstDIEOffset() &&
- die_offset < GetNextCompileUnitOffset();
+ die_offset < GetNextUnitOffset();
}
dw_offset_t GetFirstDIEOffset() const {
return m_offset + GetHeaderByteSize();
}
- dw_offset_t GetNextCompileUnitOffset() const;
+ dw_offset_t GetNextUnitOffset() const;
// Size of the CU data (without initial length and without header).
size_t GetDebugInfoSize() const;
// Size of the CU data incl. header but without initial length.
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
@@ -58,7 +58,7 @@
const DWARFDataExtractor &data = GetData();
DWARFFormValue::FixedFormSizes fixed_form_sizes =
DWARFFormValue::GetFixedFormSizesForAddressSize(GetAddressByteSize());
- if (offset < GetNextCompileUnitOffset() &&
+ if (offset < GetNextUnitOffset() &&
m_first_die.FastExtract(data, this, fixed_form_sizes, &offset)) {
AddUnitDIE(m_first_die);
return;
@@ -151,7 +151,7 @@
// Set the offset to that of the first DIE and calculate the start of the
// next compilation unit header.
lldb::offset_t offset = GetFirstDIEOffset();
- lldb::offset_t next_cu_offset = GetNextCompileUnitOffset();
+ lldb::offset_t next_cu_offset = GetNextUnitOffset();
DWARFDebugInfoEntry die;
@@ -375,7 +375,7 @@
return local_id;
}
-dw_offset_t DWARFUnit::GetNextCompileUnitOffset() const {
+dw_offset_t DWARFUnit::GetNextUnitOffset() const {
return m_offset + GetLengthByteSize() + GetLength();
}
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
@@ -209,7 +209,7 @@
const DWARFDataExtractor &debug_info_data = cu->GetData();
// const DWARFDataExtractor& debug_str_data =
// dwarf2Data->get_debug_str_data();
- const uint32_t cu_end_offset = cu->GetNextCompileUnitOffset();
+ const uint32_t cu_end_offset = cu->GetNextUnitOffset();
lldb::offset_t offset = *offset_ptr;
// if (offset >= cu_end_offset)
// Log::Status("DIE at offset 0x%8.8x is beyond the end of the current
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
@@ -39,11 +39,11 @@
explicit DWARFDebugInfo(lldb_private::DWARFContext &context);
void SetDwarfData(SymbolFileDWARF *dwarf2Data);
- size_t GetNumCompileUnits();
- DWARFUnit *GetCompileUnitAtIndex(uint32_t idx);
- DWARFUnit *GetCompileUnit(dw_offset_t cu_offset, uint32_t *idx_ptr = NULL);
- DWARFUnit *GetCompileUnitContainingDIEOffset(dw_offset_t die_offset);
- DWARFUnit *GetCompileUnit(const DIERef &die_ref);
+ size_t GetNumUnits();
+ DWARFUnit *GetUnitAtIndex(uint32_t idx);
+ DWARFUnit *GetUnit(dw_offset_t cu_offset, uint32_t *idx_ptr = NULL);
+ DWARFUnit *GetUnitContainingDIEOffset(dw_offset_t die_offset);
+ DWARFUnit *GetUnit(const DIERef &die_ref);
DWARFDIE GetDIEForDIEOffset(dw_offset_t die_offset);
DWARFDIE GetDIE(const DIERef &die_ref);
@@ -57,50 +57,50 @@
llvm::Expected<DWARFDebugAranges &> GetCompileUnitAranges();
protected:
- static bool OffsetLessThanCompileUnitOffset(dw_offset_t offset,
- const DWARFUnitSP &cu_sp);
+ static bool OffsetLessThanUnitOffset(dw_offset_t offset,
+ const DWARFUnitSP &cu_sp);
- typedef std::vector<DWARFUnitSP> CompileUnitColl;
+ typedef std::vector<DWARFUnitSP> UnitColl;
// Member variables
SymbolFileDWARF *m_dwarf2Data;
lldb_private::DWARFContext &m_context;
- CompileUnitColl m_compile_units;
+ UnitColl m_units;
std::unique_ptr<DWARFDebugAranges>
m_cu_aranges_up; // A quick address to compile unit table
private:
// All parsing needs to be done partially any managed by this class as
// accessors are called.
- void ParseCompileUnitHeadersIfNeeded();
+ void ParseUnitHeadersIfNeeded();
template<class Contains>
- DWARFUnit *GetCompileUnitTmpl(
+ DWARFUnit *GetUnitTmpl(
Contains contains, dw_offset_t offset, uint32_t *idx_ptr = NULL);
DISALLOW_COPY_AND_ASSIGN(DWARFDebugInfo);
};
template<class Contains>
-DWARFUnit *DWARFDebugInfo::GetCompileUnitTmpl(
+DWARFUnit *DWARFDebugInfo::GetUnitTmpl(
Contains contains, dw_offset_t offset, uint32_t *idx_ptr) {
- ParseCompileUnitHeadersIfNeeded();
+ ParseUnitHeadersIfNeeded();
DWARFUnitSP cu_sp;
- // Watch out for single compile unit executable as they are pretty common
- const size_t num_cus = m_compile_units.size();
+ // Watch out for single unit executable as they are pretty common
+ const size_t num_cus = m_units.size();
if (num_cus == 1) {
- if (contains(*m_compile_units[0], offset)) {
+ if (contains(*m_units[0], offset)) {
if (idx_ptr)
*idx_ptr = 0;
- return m_compile_units[0].get();
+ return m_units[0].get();
}
} else if (num_cus) {
- CompileUnitColl::const_iterator end_pos = m_compile_units.end();
- CompileUnitColl::const_iterator begin_pos = m_compile_units.begin();
- CompileUnitColl::const_iterator pos = std::upper_bound(
- begin_pos, end_pos, offset, OffsetLessThanCompileUnitOffset);
+ UnitColl::const_iterator end_pos = m_units.end();
+ UnitColl::const_iterator begin_pos = m_units.begin();
+ UnitColl::const_iterator pos = std::upper_bound(
+ begin_pos, end_pos, offset, OffsetLessThanUnitOffset);
if (pos != begin_pos) {
--pos;
if (contains(**pos, offset)) {
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
@@ -29,13 +29,12 @@
// Constructor
DWARFDebugInfo::DWARFDebugInfo(lldb_private::DWARFContext &context)
- : m_dwarf2Data(NULL), m_context(context), m_compile_units(),
- m_cu_aranges_up() {}
+ : m_dwarf2Data(NULL), m_context(context), m_units(), m_cu_aranges_up() {}
// SetDwarfData
void DWARFDebugInfo::SetDwarfData(SymbolFileDWARF *dwarf2Data) {
m_dwarf2Data = dwarf2Data;
- m_compile_units.clear();
+ m_units.clear();
}
llvm::Expected<DWARFDebugAranges &> DWARFDebugInfo::GetCompileUnitAranges() {
@@ -63,9 +62,9 @@
// Manually build arange data for everything that wasn't in the
// .debug_aranges table.
- const size_t num_compile_units = GetNumCompileUnits();
- for (size_t idx = 0; idx < num_compile_units; ++idx) {
- DWARFUnit *cu = GetCompileUnitAtIndex(idx);
+ const size_t num_units = GetNumUnits();
+ for (size_t idx = 0; idx < num_units; ++idx) {
+ DWARFUnit *cu = GetUnitAtIndex(idx);
dw_offset_t offset = cu->GetOffset();
if (cus_with_data.find(offset) == cus_with_data.end())
@@ -77,8 +76,8 @@
return *m_cu_aranges_up;
}
-void DWARFDebugInfo::ParseCompileUnitHeadersIfNeeded() {
- if (!m_compile_units.empty())
+void DWARFDebugInfo::ParseUnitHeadersIfNeeded() {
+ if (!m_units.empty())
return;
if (!m_dwarf2Data)
return;
@@ -96,51 +95,49 @@
return;
}
- // If it didn't return an error, then it should be returning a valid
- // CompileUnit.
+ // If it didn't return an error, then it should be returning a valid Unit.
assert(*cu_sp);
- m_compile_units.push_back(*cu_sp);
+ m_units.push_back(*cu_sp);
- offset = (*cu_sp)->GetNextCompileUnitOffset();
+ offset = (*cu_sp)->GetNextUnitOffset();
}
}
-size_t DWARFDebugInfo::GetNumCompileUnits() {
- ParseCompileUnitHeadersIfNeeded();
- return m_compile_units.size();
+size_t DWARFDebugInfo::GetNumUnits() {
+ ParseUnitHeadersIfNeeded();
+ return m_units.size();
}
-DWARFUnit *DWARFDebugInfo::GetCompileUnitAtIndex(uint32_t idx) {
+DWARFUnit *DWARFDebugInfo::GetUnitAtIndex(uint32_t idx) {
DWARFUnit *cu = NULL;
- if (idx < GetNumCompileUnits())
- cu = m_compile_units[idx].get();
+ if (idx < GetNumUnits())
+ cu = m_units[idx].get();
return cu;
}
-bool DWARFDebugInfo::OffsetLessThanCompileUnitOffset(
+bool DWARFDebugInfo::OffsetLessThanUnitOffset(
dw_offset_t offset, const DWARFUnitSP &cu_sp) {
return offset < cu_sp->GetOffset();
}
-DWARFUnit *DWARFDebugInfo::GetCompileUnit(dw_offset_t cu_offset,
- uint32_t *idx_ptr) {
- return GetCompileUnitTmpl(
+DWARFUnit *DWARFDebugInfo::GetUnit(dw_offset_t cu_offset, uint32_t *idx_ptr) {
+ return GetUnitTmpl(
[](const DWARFUnit &unit, dw_offset_t cu_offset) {
return unit.GetOffset() == cu_offset;
}, cu_offset, idx_ptr);
}
-DWARFUnit *DWARFDebugInfo::GetCompileUnit(const DIERef &die_ref) {
+DWARFUnit *DWARFDebugInfo::GetUnit(const DIERef &die_ref) {
if (die_ref.cu_offset == DW_INVALID_OFFSET)
- return GetCompileUnitContainingDIEOffset(die_ref.die_offset);
+ return GetUnitContainingDIEOffset(die_ref.die_offset);
else
- return GetCompileUnit(die_ref.cu_offset);
+ return GetUnit(die_ref.cu_offset);
}
DWARFUnit *
-DWARFDebugInfo::GetCompileUnitContainingDIEOffset(dw_offset_t die_offset) {
- return GetCompileUnitTmpl(
+DWARFDebugInfo::GetUnitContainingDIEOffset(dw_offset_t die_offset) {
+ return GetUnitTmpl(
[](const DWARFUnit &unit, dw_offset_t die_offset) {
return unit.ContainsDIEOffset(die_offset);
}, die_offset);
@@ -148,7 +145,7 @@
DWARFDIE
DWARFDebugInfo::GetDIEForDIEOffset(dw_offset_t die_offset) {
- DWARFUnit *cu = GetCompileUnitContainingDIEOffset(die_offset);
+ DWARFUnit *cu = GetUnitContainingDIEOffset(die_offset);
if (cu)
return cu->GetDIE(die_offset);
return DWARFDIE();
@@ -159,7 +156,7 @@
// Get the DIE (Debug Information Entry) with the specified offset.
DWARFDIE
DWARFDebugInfo::GetDIE(const DIERef &die_ref) {
- DWARFUnit *cu = GetCompileUnit(die_ref);
+ DWARFUnit *cu = GetUnit(die_ref);
if (cu)
return cu->GetDIE(die_ref.die_offset);
return DWARFDIE(); // Not found
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
@@ -65,8 +65,8 @@
}
}
set.Clear();
- }
- return llvm::ErrorSuccess();
+ }
+ return llvm::ErrorSuccess();
}
void DWARFDebugAranges::Dump(Log *log) const {
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
@@ -154,7 +154,7 @@
if (cu->ContainsDIEOffset(block_die->GetOffset()))
return DWARFDIE(cu, block_die);
else
- return DWARFDIE(dwarf->DebugInfo()->GetCompileUnit(
+ return DWARFDIE(dwarf->DebugInfo()->GetUnit(
DIERef(cu->GetOffset(), block_die->GetOffset())),
block_die);
}
Index: lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -50,8 +50,7 @@
cu_sp->m_addr_size = debug_info.GetU8(offset_ptr);
}
- bool length_OK =
- debug_info.ValidOffset(cu_sp->GetNextCompileUnitOffset() - 1);
+ bool length_OK = debug_info.ValidOffset(cu_sp->GetNextUnitOffset() - 1);
bool version_OK = SymbolFileDWARF::SupportedVersion(cu_sp->m_version);
bool abbr_offset_OK =
dwarf2Data->get_debug_abbrev_data().ValidOffset(abbr_offset);
@@ -83,7 +82,7 @@
"abbr_offset = 0x%8.8x, addr_size = 0x%2.2x (next CU at "
"{0x%8.8x})\n",
m_offset, m_length, m_version, GetAbbrevOffset(), m_addr_size,
- GetNextCompileUnitOffset());
+ GetNextUnitOffset());
}
uint32_t DWARFCompileUnit::GetHeaderByteSize() const {
Index: lldb/source/Plugins/SymbolFile/DWARF/DIERef.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/DIERef.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/DIERef.cpp
@@ -23,7 +23,7 @@
DWARFDebugInfo *debug_info = actual_dwarf->DebugInfo();
if (debug_info) {
DWARFUnit *dwarf_cu =
- debug_info->GetCompileUnitContainingDIEOffset(die_offset);
+ debug_info->GetUnitContainingDIEOffset(die_offset);
if (dwarf_cu) {
cu_offset = dwarf_cu->GetOffset();
return;
Index: lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
@@ -75,7 +75,7 @@
DWARFMappedHash::DIEInfoArray hash_data;
if (m_apple_names_up->AppendAllDIEsInRange(
- cu.GetOffset(), cu.GetNextCompileUnitOffset(), hash_data))
+ cu.GetOffset(), cu.GetNextUnitOffset(), hash_data))
DWARFMappedHash::ExtractDIEArray(hash_data, offsets);
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
