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

Refactor to not use if constexpr

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-02-17 21:40:39 -06:00
parent a4faef7f1e
commit e22300b36d
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,13 +39,6 @@ namespace libdwarf {
constexpr bool dump_dwarf = false; constexpr bool dump_dwarf = false;
constexpr bool trace_dwarf = false; constexpr bool trace_dwarf = false;
struct cu_entry {
die_object die;
Dwarf_Half dwversion;
Dwarf_Addr low;
Dwarf_Addr high;
};
// sorted range entries for dies // sorted range entries for dies
template<typename T> template<typename T>
class die_cache { class die_cache {
@ -101,10 +94,23 @@ namespace libdwarf {
std::size_t ranges_count() const { std::size_t ranges_count() const {
return range_entries.size(); return range_entries.size();
} }
struct die_and_data { struct die_and_data {
const die_object& die; const die_object& die;
const T& data; const T& data;
}; };
template<typename Ret = const die_object&>
auto make_lookup_result(typename std::vector<range_entry>::const_iterator vec_it) const
-> typename std::enable_if<std::is_same<T, monostate>::value, Ret>::type
{
return dies.at(vec_it->die.die_index);
}
template<typename Ret = die_and_data>
auto make_lookup_result(typename std::vector<range_entry>::const_iterator vec_it) const
-> typename std::enable_if<!std::is_same<T, monostate>::value, Ret>::type
{
return die_and_data{dies.at(vec_it->die.die_index), vec_it->data};
}
using lookup_result = typename std::conditional< using lookup_result = typename std::conditional<
std::is_same<T, monostate>::value, std::is_same<T, monostate>::value,
const die_object&, const die_object&,
@ -122,11 +128,8 @@ namespace libdwarf {
if(vec_it == range_entries.end()) { if(vec_it == range_entries.end()) {
return nullopt; return nullopt;
} }
if constexpr(std::is_same<T, monostate>::value) { // This would be an if constexpr if only C++17...
return dies.at(vec_it->die.die_index); return make_lookup_result(vec_it);
} else {
return die_and_data{dies.at(vec_it->die.die_index), vec_it->data};
}
} }
}; };