Skip to content

Commit 59c5d53

Browse files
authored
[LLDB][NFC] Replace DWARFUnit with DWARFExpression::Delegate in DWARFExpressionList too (#133049)
This is an update for #131645.
1 parent 1c9fe8c commit 59c5d53

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

lldb/include/lldb/Expression/DWARFExpressionList.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616

1717
namespace lldb_private {
1818

19-
namespace plugin {
20-
namespace dwarf {
21-
class DWARFUnit;
22-
} // namespace dwarf
23-
} // namespace plugin
24-
2519
/// \class DWARFExpressionList DWARFExpressionList.h
2620
/// "lldb/Expression/DWARFExpressionList.h" Encapsulates a range map from file
2721
/// address range to a single DWARF location expression.
@@ -30,13 +24,13 @@ class DWARFExpressionList {
3024
DWARFExpressionList() = default;
3125

3226
DWARFExpressionList(lldb::ModuleSP module_sp,
33-
const plugin::dwarf::DWARFUnit *dwarf_cu,
27+
const DWARFExpression::Delegate *dwarf_cu,
3428
lldb::addr_t func_file_addr)
3529
: m_module_wp(module_sp), m_dwarf_cu(dwarf_cu),
3630
m_func_file_addr(func_file_addr) {}
3731

3832
DWARFExpressionList(lldb::ModuleSP module_sp, DWARFExpression expr,
39-
const plugin::dwarf::DWARFUnit *dwarf_cu)
33+
const DWARFExpression::Delegate *dwarf_cu)
4034
: m_module_wp(module_sp), m_dwarf_cu(dwarf_cu) {
4135
AddExpression(0, LLDB_INVALID_ADDRESS, expr);
4236
}
@@ -139,7 +133,7 @@ class DWARFExpressionList {
139133
/// The DWARF compile unit this expression belongs to. It is used to evaluate
140134
/// values indexing into the .debug_addr section (e.g. DW_OP_GNU_addr_index,
141135
/// DW_OP_GNU_const_index)
142-
const plugin::dwarf::DWARFUnit *m_dwarf_cu = nullptr;
136+
const DWARFExpression::Delegate *m_dwarf_cu = nullptr;
143137

144138
// Function base file address.
145139
lldb::addr_t m_func_file_addr = LLDB_INVALID_ADDRESS;

lldb/source/Expression/DWARFExpressionList.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "lldb/Expression/DWARFExpressionList.h"
10-
#include "Plugins/SymbolFile/DWARF/DWARFUnit.h"
1110
#include "lldb/Symbol/Function.h"
1211
#include "lldb/Target/RegisterContext.h"
1312
#include "lldb/Target/StackFrame.h"

0 commit comments

Comments
 (0)