Index: source/Plugins/SymbolFile/DWARF/DIERef.h =================================================================== --- source/Plugins/SymbolFile/DWARF/DIERef.h +++ source/Plugins/SymbolFile/DWARF/DIERef.h @@ -18,7 +18,7 @@ struct DIERef { DIERef() = default; - DIERef(dw_offset_t c, dw_offset_t d) : cu_offset(c), die_offset(d) {} + DIERef(dw_offset_t c, dw_offset_t d) : cu_idx(c), die_offset(d) {} // In order to properly decode a lldb::user_id_t back into a DIERef we // need the DWARF file since it knows if DWARF in .o files is being used @@ -41,10 +41,10 @@ bool operator<(const DIERef &ref) { return die_offset < ref.die_offset; } explicit operator bool() const { - return cu_offset != DW_INVALID_OFFSET || die_offset != DW_INVALID_OFFSET; + return cu_idx != DW_INVALID_OFFSET || die_offset != DW_INVALID_OFFSET; } - dw_offset_t cu_offset = DW_INVALID_OFFSET; + dw_offset_t cu_idx = DW_INVALID_OFFSET; dw_offset_t die_offset = DW_INVALID_OFFSET; }; Index: source/Plugins/SymbolFile/DWARF/DIERef.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/DIERef.cpp +++ source/Plugins/SymbolFile/DWARF/DIERef.cpp @@ -14,7 +14,7 @@ #include "SymbolFileDWARFDebugMap.h" DIERef::DIERef(lldb::user_id_t uid, SymbolFileDWARF *dwarf) - : cu_offset(DW_INVALID_OFFSET), die_offset(uid & 0xffffffff) { + : die_offset(uid & 0xffffffff) { SymbolFileDWARFDebugMap *debug_map = dwarf->GetDebugMapSymfile(); if (debug_map) { const uint32_t oso_idx = debug_map->GetOSOIndexFromUserID(uid); @@ -25,27 +25,22 @@ DWARFUnit *dwarf_cu = debug_info->GetCompileUnitContainingDIEOffset(die_offset); if (dwarf_cu) { - cu_offset = dwarf_cu->GetOffset(); + cu_idx = dwarf_cu->GetID(); return; } } } die_offset = DW_INVALID_OFFSET; } else { - cu_offset = uid >> 32; + cu_idx = uid >> 32; } } -DIERef::DIERef(const DWARFFormValue &form_value) - : cu_offset(DW_INVALID_OFFSET), die_offset(DW_INVALID_OFFSET) { +DIERef::DIERef(const DWARFFormValue &form_value) { if (form_value.IsValid()) { const DWARFUnit *dwarf_cu = form_value.GetCompileUnit(); - if (dwarf_cu) { - if (dwarf_cu->GetBaseObjOffset() != DW_INVALID_OFFSET) - cu_offset = dwarf_cu->GetBaseObjOffset(); - else - cu_offset = dwarf_cu->GetOffset(); - } + if (dwarf_cu) + cu_idx = dwarf_cu->GetID(); die_offset = form_value.Reference(); } } Index: source/Plugins/SymbolFile/DWARF/DWARFBaseDIE.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/DWARFBaseDIE.cpp +++ source/Plugins/SymbolFile/DWARF/DWARFBaseDIE.cpp @@ -21,10 +21,7 @@ if (!IsValid()) return DIERef(); - dw_offset_t cu_offset = m_cu->GetOffset(); - if (m_cu->GetBaseObjOffset() != DW_INVALID_OFFSET) - cu_offset = m_cu->GetBaseObjOffset(); - return DIERef(cu_offset, m_die->GetOffset()); + return DIERef(m_cu->GetID(), m_die->GetOffset()); } dw_tag_t DWARFBaseDIE::Tag() const { Index: source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp +++ source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp @@ -157,10 +157,10 @@ } DWARFUnit *DWARFDebugInfo::GetCompileUnit(const DIERef &die_ref) { - if (die_ref.cu_offset == DW_INVALID_OFFSET) + if (die_ref.cu_idx == DW_INVALID_OFFSET) return GetCompileUnitContainingDIEOffset(die_ref.die_offset); else - return GetCompileUnitAtOffset(die_ref.cu_offset); + return GetCompileUnitAtIndex(die_ref.cu_idx); } DWARFUnit * Index: source/Plugins/SymbolFile/DWARF/DWARFUnit.h =================================================================== --- source/Plugins/SymbolFile/DWARF/DWARFUnit.h +++ source/Plugins/SymbolFile/DWARF/DWARFUnit.h @@ -104,7 +104,6 @@ dw_addr_t GetStrOffsetsBase() const { return m_str_offsets_base; } void SetAddrBase(dw_addr_t addr_base); void SetRangesBase(dw_addr_t ranges_base); - void SetBaseObjOffset(dw_offset_t base_obj_offset); void SetStrOffsetsBase(dw_offset_t str_offsets_base); void BuildAddressRangeTable(SymbolFileDWARF *dwarf, DWARFDebugAranges *debug_aranges); @@ -160,8 +159,6 @@ SymbolFileDWARFDwo *GetDwoSymbolFile() const; - dw_offset_t GetBaseObjOffset() const; - die_iterator_range dies() { ExtractDIEsIfNeeded(); return die_iterator_range(m_die_array.begin(), m_die_array.end()); @@ -207,7 +204,6 @@ dw_addr_t m_ranges_base = 0; // Value of DW_AT_ranges_base // If this is a dwo compile unit this is the offset of the base compile unit // in the main object file - dw_offset_t m_base_obj_offset = DW_INVALID_OFFSET; dw_offset_t m_str_offsets_base = 0; // Value of DW_AT_str_offsets_base. // Offset of the initial length field. dw_offset_t m_offset; Index: source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp +++ source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp @@ -332,7 +332,7 @@ DW_AT_GNU_ranges_base, 0); dwo_cu->SetRangesBase(ranges_base); - dwo_cu->SetBaseObjOffset(m_offset); + dwo_cu->SetID(GetID()); SetDwoStrOffsetsBase(dwo_cu); } @@ -388,10 +388,6 @@ m_ranges_base = ranges_base; } -void DWARFUnit::SetBaseObjOffset(dw_offset_t base_obj_offset) { - m_base_obj_offset = base_obj_offset; -} - void DWARFUnit::SetStrOffsetsBase(dw_offset_t str_offsets_base) { m_str_offsets_base = str_offsets_base; } @@ -768,8 +764,6 @@ return m_dwo_symbol_file.get(); } -dw_offset_t DWARFUnit::GetBaseObjOffset() const { return m_base_obj_offset; } - const DWARFDebugAranges &DWARFUnit::GetFunctionAranges() { if (m_func_aranges_up == NULL) { m_func_aranges_up.reset(new DWARFDebugAranges()); Index: source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp +++ source/Plugins/SymbolFile/DWARF/DebugNamesDWARFIndex.cpp @@ -66,7 +66,7 @@ uint64_t die_bias = cu->GetDwoSymbolFile() ? 0 : *cu_offset; if (llvm::Optional die_offset = entry.getDIEUnitOffset()) - return DIERef(*cu_offset, die_bias + *die_offset); + return DIERef(cu->GetID(), die_bias + *die_offset); return DIERef(); } @@ -164,7 +164,7 @@ if (!ref) continue; - DWARFUnit *cu = m_debug_info.GetCompileUnitAtOffset(ref.cu_offset); + DWARFUnit *cu = m_debug_info.GetCompileUnitAtIndex(ref.cu_idx); if (!cu || !cu->Supports_DW_AT_APPLE_objc_complete_type()) { incomplete_types.push_back(ref); continue; Index: source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.h =================================================================== --- source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.h +++ source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.h @@ -60,7 +60,7 @@ static void IndexUnitImpl(DWARFUnit &unit, const lldb::LanguageType cu_language, const DWARFFormValue::FixedFormSizes &fixed_form_sizes, - const dw_offset_t cu_offset, IndexSet &set); + IndexSet &set); /// Non-null value means we haven't built the index yet. DWARFDebugInfo *m_debug_info; Index: source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp +++ source/Plugins/SymbolFile/DWARF/ManualDWARFIndex.cpp @@ -102,19 +102,19 @@ const LanguageType cu_language = unit.GetLanguageType(); DWARFFormValue::FixedFormSizes fixed_form_sizes = unit.GetFixedFormSizes(); - IndexUnitImpl(unit, cu_language, fixed_form_sizes, unit.GetOffset(), set); + IndexUnitImpl(unit, cu_language, fixed_form_sizes, set); SymbolFileDWARFDwo *dwo_symbol_file = unit.GetDwoSymbolFile(); if (dwo_symbol_file && dwo_symbol_file->GetCompileUnit()) { IndexUnitImpl(*dwo_symbol_file->GetCompileUnit(), cu_language, - fixed_form_sizes, unit.GetOffset(), set); + fixed_form_sizes, set); } } void ManualDWARFIndex::IndexUnitImpl( DWARFUnit &unit, const LanguageType cu_language, - const DWARFFormValue::FixedFormSizes &fixed_form_sizes, - const dw_offset_t cu_offset, IndexSet &set) { + const DWARFFormValue::FixedFormSizes &fixed_form_sizes, IndexSet &set) { + user_id_t unit_id = unit.GetID(); for (const DWARFDebugInfoEntry &die : unit.dies()) { const dw_tag_t tag = die.Tag(); @@ -259,22 +259,20 @@ objc_method.GetFullNameWithoutCategory(true)); ConstString objc_class_name_no_category(objc_method.GetClassName()); set.function_fullnames.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); if (objc_class_name_with_category) - set.objc_class_selectors.Insert( - objc_class_name_with_category, - DIERef(cu_offset, die.GetOffset())); + set.objc_class_selectors.Insert(objc_class_name_with_category, + DIERef(unit_id, die.GetOffset())); if (objc_class_name_no_category && objc_class_name_no_category != objc_class_name_with_category) - set.objc_class_selectors.Insert( - objc_class_name_no_category, - DIERef(cu_offset, die.GetOffset())); + set.objc_class_selectors.Insert(objc_class_name_no_category, + DIERef(unit_id, die.GetOffset())); if (objc_selector_name) set.function_selectors.Insert(objc_selector_name, - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); if (objc_fullname_no_category_name) set.function_fullnames.Insert(objc_fullname_no_category_name, - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); } // If we have a mangled name, then the DW_AT_name attribute is // usually the method name without the class or any parameters @@ -282,14 +280,14 @@ if (is_method) set.function_methods.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); else set.function_basenames.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); if (!is_method && !mangled_cstr && !objc_method.IsValid(true)) set.function_fullnames.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); } if (mangled_cstr) { // Make sure our mangled name isn't the same string table entry as @@ -300,7 +298,7 @@ ((mangled_cstr[0] == '_') || (::strcmp(name, mangled_cstr) != 0))) { set.function_fullnames.Insert(ConstString(mangled_cstr), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); } } } @@ -318,22 +316,21 @@ case DW_TAG_union_type: case DW_TAG_unspecified_type: if (name && !is_declaration) - set.types.Insert(ConstString(name), DIERef(cu_offset, die.GetOffset())); + set.types.Insert(ConstString(name), DIERef(unit_id, die.GetOffset())); if (mangled_cstr && !is_declaration) set.types.Insert(ConstString(mangled_cstr), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); break; case DW_TAG_namespace: if (name) set.namespaces.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); break; case DW_TAG_variable: if (name && has_location_or_const_value && is_global_or_static_variable) { - set.globals.Insert(ConstString(name), - DIERef(cu_offset, die.GetOffset())); + set.globals.Insert(ConstString(name), DIERef(unit_id, die.GetOffset())); // Be sure to include variables by their mangled and demangled names if // they have any since a variable can have a basename "i", a mangled // named "_ZN12_GLOBAL__N_11iE" and a demangled mangled name @@ -346,7 +343,7 @@ if (mangled_cstr && name != mangled_cstr && ((mangled_cstr[0] == '_') || (::strcmp(name, mangled_cstr) != 0))) { set.globals.Insert(ConstString(mangled_cstr), - DIERef(cu_offset, die.GetOffset())); + DIERef(unit_id, die.GetOffset())); } } break; @@ -371,7 +368,7 @@ void ManualDWARFIndex::GetGlobalVariables(const DWARFUnit &cu, DIEArray &offsets) { Index(); - m_set.globals.FindAllEntriesForCompileUnit(cu.GetOffset(), offsets); + m_set.globals.FindAllEntriesForCompileUnit(cu.GetID(), offsets); } void ManualDWARFIndex::GetObjCMethods(ConstString class_name, Index: source/Plugins/SymbolFile/DWARF/NameToDIE.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/NameToDIE.cpp +++ source/Plugins/SymbolFile/DWARF/NameToDIE.cpp @@ -38,13 +38,13 @@ return m_map.GetValues(regex, info_array); } -size_t NameToDIE::FindAllEntriesForCompileUnit(dw_offset_t cu_offset, +size_t NameToDIE::FindAllEntriesForCompileUnit(dw_offset_t cu_idx, DIEArray &info_array) const { const size_t initial_size = info_array.size(); const uint32_t size = m_map.GetSize(); for (uint32_t i = 0; i < size; ++i) { const DIERef &die_ref = m_map.GetValueAtIndexUnchecked(i); - if (cu_offset == die_ref.cu_offset) + if (cu_idx == die_ref.cu_idx) info_array.push_back(die_ref); } return info_array.size() - initial_size; @@ -56,7 +56,7 @@ ConstString cstr = m_map.GetCStringAtIndex(i); const DIERef &die_ref = m_map.GetValueAtIndexUnchecked(i); s->Printf("%p: {0x%8.8x/0x%8.8x} \"%s\"\n", (const void *)cstr.GetCString(), - die_ref.cu_offset, die_ref.die_offset, cstr.GetCString()); + die_ref.cu_idx, die_ref.die_offset, cstr.GetCString()); } } Index: source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp =================================================================== --- source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp +++ source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDwo.cpp @@ -23,7 +23,7 @@ DWARFUnit *dwarf_cu) : SymbolFileDWARF(objfile.get()), m_obj_file_sp(objfile), m_base_dwarf_cu(dwarf_cu) { - SetID(((lldb::user_id_t)dwarf_cu->GetOffset()) << 32); + SetID(((lldb::user_id_t)dwarf_cu->GetID()) << 32); } void SymbolFileDWARFDwo::LoadSectionData(lldb::SectionType sect_type, @@ -158,6 +158,6 @@ DWARFDIE SymbolFileDWARFDwo::GetDIE(const DIERef &die_ref) { - lldbassert(m_base_dwarf_cu->GetOffset() == die_ref.cu_offset); + assert(m_base_dwarf_cu->GetID() == die_ref.cu_idx); return DebugInfo()->GetDIEForDIEOffset(die_ref.die_offset); }