================ @@ -7,65 +7,45 @@ //===----------------------------------------------------------------------===// #include "DWARFDebugAranges.h" -#include "DWARFDebugArangeSet.h" #include "DWARFUnit.h" #include "LogChannelDWARF.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Timer.h" +#include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h" using namespace lldb; using namespace lldb_private; using namespace lldb_private::plugin::dwarf; +using llvm::DWARFDebugArangeSet; // Constructor DWARFDebugAranges::DWARFDebugAranges() : m_aranges() {} -// CountArangeDescriptors -class CountArangeDescriptors { -public: - CountArangeDescriptors(uint32_t &count_ref) : count(count_ref) { - // printf("constructor CountArangeDescriptors()\n"); - } - void operator()(const DWARFDebugArangeSet &set) { - count += set.NumDescriptors(); - } - uint32_t &count; -}; - // Extract void DWARFDebugAranges::extract(const DWARFDataExtractor &debug_aranges_data) { + llvm::DWARFDataExtractor llvm_dwarf_data = ---------------- felipepiovezan wrote:
I understand that in the transition period it might look nice to prefix this with `llvm`, but it probably won't age well as we move more data structures into the LLVM side. I'd just call this `data` (like you did in the unit test) or `dwarf_data` https://github.com/llvm/llvm-project/pull/110058 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits