Make file_range optional in DWARFExpressionEntry for always-valid expr

UltimateForce21 · UltimateForce21 · commit 3462165da781 · 2025-07-07T22:39:45.000-04:00
diff --git a/lldb/include/lldb/Expression/DWARFExpressionList.h b/lldb/include/lldb/Expression/DWARFExpressionList.h
@@ -63,7 +63,7 @@ class DWARFExpressionList {
   /// Represents an entry in the DWARFExpressionList with all needed metadata.
   struct DWARFExpressionEntry {
     /// Represents a DWARF location range in the DWARF unit’s file‐address space
-    AddressRange file_range;
+    std::optional<AddressRange> file_range; ///< None = always-valid single expr
     const DWARFExpression *expr;
   };
 
diff --git a/lldb/source/Expression/DWARFExpressionList.cpp b/lldb/source/Expression/DWARFExpressionList.cpp
@@ -58,8 +58,7 @@ std::optional<DWARFExpressionList::DWARFExpressionEntry>
 DWARFExpressionList::GetExpressionEntryAtAddress(lldb::addr_t func_load_addr,
                                                 lldb::addr_t load_addr) const {
   if (const DWARFExpression *always = GetAlwaysValidExpr()) {
-    AddressRange full_range(m_func_file_addr, /*size=*/LLDB_INVALID_ADDRESS);
-    return DWARFExpressionEntry{full_range, always};
+    return DWARFExpressionEntry{std::nullopt, always};
   }
 
   if (func_load_addr == LLDB_INVALID_ADDRESS)

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ std::optional<DWARFExpressionList::DWARFExpressionEntry>`
`58`	`58`	`DWARFExpressionList::GetExpressionEntryAtAddress(lldb::addr_t func_load_addr,`
`59`	`59`	`lldb::addr_t load_addr) const {`
`60`	`60`	`if (const DWARFExpression *always = GetAlwaysValidExpr()) {`
`61`		`- AddressRange full_range(m_func_file_addr, /size=/LLDB_INVALID_ADDRESS);`
`62`		`- return DWARFExpressionEntry{full_range, always};`
	`61`	`+ return DWARFExpressionEntry{std::nullopt, always};`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`if (func_load_addr == LLDB_INVALID_ADDRESS)`