[LLDB][NFC] Replace DWARFUnit with DWARFExpression::Delegate in DWARFExpressionList too

[slydiman]

This is an update for #131645.

[llvmbot]

@llvm/pr-subscribers-lldb

Author: Dmitry Vasilyev (slydiman)

Changes

This is an update for #131645.

---

Full diff: https://github.com/llvm/llvm-project/pull/133049.diff

2 Files Affected:

• (modified) lldb/include/lldb/Expression/DWARFExpressionList.h (+3-9)
• (modified) lldb/source/Expression/DWARFExpressionList.cpp (-1)

diff --git a/lldb/include/lldb/Expression/DWARFExpressionList.h b/lldb/include/lldb/Expression/DWARFExpressionList.h
index 519bbb354fa6f..d8f8ec247ed56 100644
--- a/lldb/include/lldb/Expression/DWARFExpressionList.h
+++ b/lldb/include/lldb/Expression/DWARFExpressionList.h
@@ -16,12 +16,6 @@
 
 namespace lldb_private {
 
-namespace plugin {
-namespace dwarf {
-class DWARFUnit;
-} // namespace dwarf
-} // namespace plugin
-
 /// \class DWARFExpressionList DWARFExpressionList.h
 /// "lldb/Expression/DWARFExpressionList.h" Encapsulates a range map from file
 /// address range to a single DWARF location expression.
@@ -30,13 +24,13 @@ class DWARFExpressionList {
   DWARFExpressionList() = default;
 
   DWARFExpressionList(lldb::ModuleSP module_sp,
-                      const plugin::dwarf::DWARFUnit *dwarf_cu,
+                      const DWARFExpression::Delegate *dwarf_cu,
                       lldb::addr_t func_file_addr)
       : m_module_wp(module_sp), m_dwarf_cu(dwarf_cu),
         m_func_file_addr(func_file_addr) {}
 
   DWARFExpressionList(lldb::ModuleSP module_sp, DWARFExpression expr,
-                      const plugin::dwarf::DWARFUnit *dwarf_cu)
+                      const DWARFExpression::Delegate *dwarf_cu)
       : m_module_wp(module_sp), m_dwarf_cu(dwarf_cu) {
     AddExpression(0, LLDB_INVALID_ADDRESS, expr);
   }
@@ -139,7 +133,7 @@ class DWARFExpressionList {
   /// The DWARF compile unit this expression belongs to. It is used to evaluate
   /// values indexing into the .debug_addr section (e.g. DW_OP_GNU_addr_index,
   /// DW_OP_GNU_const_index)
-  const plugin::dwarf::DWARFUnit *m_dwarf_cu = nullptr;
+  const DWARFExpression::Delegate *m_dwarf_cu = nullptr;
 
   // Function base file address.
   lldb::addr_t m_func_file_addr = LLDB_INVALID_ADDRESS;
diff --git a/lldb/source/Expression/DWARFExpressionList.cpp b/lldb/source/Expression/DWARFExpressionList.cpp
index be6c0a151159d..04592a1eb7ff4 100644
--- a/lldb/source/Expression/DWARFExpressionList.cpp
+++ b/lldb/source/Expression/DWARFExpressionList.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Expression/DWARFExpressionList.h"
-#include "Plugins/SymbolFile/DWARF/DWARFUnit.h"
 #include "lldb/Symbol/Function.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StackFrame.h"