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

Implement a non-recursive get_inlines_info

Browse Source
This commit is contained in:
Jeremy 2024-02-28 22:30:47 -06:00
parent 055e0d94cf
commit 736643358b
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/symbols/symbols_with_libdwarf.cpp
View File

@ -375,11 +375,18 @@ namespace libdwarf {
std::vector<stacktrace_frame>& inlines std::vector<stacktrace_frame>& inlines
) { ) {
ASSERT(die.get_tag() == DW_TAG_subprogram || die.get_tag() == DW_TAG_inlined_subroutine); ASSERT(die.get_tag() == DW_TAG_subprogram || die.get_tag() == DW_TAG_inlined_subroutine);
auto child = die.get_child(); // get_inlines_info is recursive and recurses into dies with pc ranges matching the pc we're looking for,
if(child) { // however, because I wouldn't want anything stack overflowing I'm breaking the recursion out into a loop
optional<std::reference_wrapper<const die_object>> current_die = die;
while(current_die.has_value()) {
auto child = current_die.unwrap().get().get_child();
if(!child) {
break;
}
optional<std::reference_wrapper<const die_object>> target_die;
walk_die_list( walk_die_list(
child, child,
[this, &cu_die, pc, dwversion, &inlines] (const die_object& die) { [this, &cu_die, pc, dwversion, &inlines, &target_die] (const die_object& die) {
if(die.get_tag() == DW_TAG_inlined_subroutine && die.pc_in_die(dwversion, pc)) { if(die.get_tag() == DW_TAG_inlined_subroutine && die.pc_in_die(dwversion, pc)) {
const auto name = subprogram_symbol(die, dwversion); const auto name = subprogram_symbol(die, dwversion);
auto file_i = die.get_unsigned_attribute(DW_AT_call_file); auto file_i = die.get_unsigned_attribute(DW_AT_call_file);
@ -413,11 +420,15 @@ namespace libdwarf {
name, name,
true true
}); });
get_inlines_info(cu_die, die, pc, dwversion, inlines); target_die = die;
return false;
} else {
return true;
} }
return true;
} }
); );
// recursing into the found target as-if by get_inlines_info(cu_die, die, pc, dwversion, inlines);
current_die = target_die;
} }
} }