luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make line_table_info serve as a raii utility for dwarf line table stuff

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-17 13:50:06 -06:00
parent 8963639639
commit ead3f128aa
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/symbols/dwarf/dwarf_resolver.cpp
View File

@ -63,10 +63,32 @@ namespace libdwarf {
struct line_table_info {
Dwarf_Unsigned version;
Dwarf_Line_Context line_context;
Dwarf_Line_Context line_context = nullptr;
// sorted by low_addr
// TODO: Make this optional at some point, it may not be generated if cache mode switches during program exec...
std::vector<line_entry> line_entries;
line_table_info(
Dwarf_Unsigned version,
Dwarf_Line_Context line_context,
std::vector<line_entry>&& line_entries
) : version(version), line_context(line_context), line_entries(std::move(line_entries)) {}
~line_table_info() {
dwarf_srclines_dealloc_b(line_context);
}
line_table_info(const line_table_info&) = delete;
line_table_info(line_table_info&& other) {
std::swap(version, other.version);
std::swap(line_context, other.line_context);
std::swap(line_entries, other.line_entries);
}
line_table_info& operator=(const line_table_info&) = delete;
line_table_info& operator=(line_table_info&& other) {
std::swap(version, other.version);
std::swap(line_context, other.line_context);
std::swap(line_entries, other.line_entries);
return *this;
}
};
class dwarf_resolver;
@ -203,9 +225,6 @@ namespace libdwarf {
CPPTRACE_FORCE_NO_INLINE_FOR_PROFILING
~dwarf_resolver() override {
for(auto& entry : line_tables) {
dwarf_srclines_dealloc_b(entry.second.line_context);
}
if(aranges) {
for(int i = 0; i < arange_count; i++) {
dwarf_dealloc(dbg, aranges[i], DW_DLA_ARANGE);
@ -689,7 +708,7 @@ namespace libdwarf {
});
}
it = line_tables.insert({off, {version, line_context, std::move(line_entries)}}).first;
it = line_tables.insert({off, line_table_info{version, line_context, std::move(line_entries)}}).first;
return it->second;
}
}