[lldb] [disassembler] chore: enhance VariableAnnotator to return structured data: use AddressRange instead of start_address and end_address

Signed-off-by: Nikita B <[email protected]>

Author: n2h9

lldb/include/lldb/Core/Disassembler.h

@@ -571,14 +571,12 @@ struct VariableAnnotation {
   std::string variable_name;
   /// Location description (e.g., "r15", "undef", "const_0").
   std::string location_description;
-  /// Where this annotation starts being valid.
-  lldb::addr_t start_address;
-  /// Where this annotation ends being valid.
-  lldb::addr_t end_address;
   /// Whether variable is live at this instruction.
   bool is_live;
   /// Register numbering scheme for location interpretation.
   lldb::RegisterKind register_kind;
+  /// Where this annotation is valid.
+  std::optional<lldb_private::AddressRange> address_range;
   /// Source file where variable was declared.
   std::optional<std::string> decl_file;
   /// Line number where variable was declared.

lldb/source/API/SBInstruction.cpp

@@ -384,12 +384,16 @@ SBInstruction::GetVariableAnnotations(lldb::SBTarget target) {
     dict_sp->AddStringItem("variable_name", ann.variable_name);
     dict_sp->AddStringItem("location_description", ann.location_description);
     dict_sp->AddBooleanItem("is_live", ann.is_live);
-    dict_sp->AddItem(
-        "start_address",
-        std::make_shared<StructuredData::UnsignedInteger>(ann.start_address));
-    dict_sp->AddItem(
-        "end_address",
-        std::make_shared<StructuredData::UnsignedInteger>(ann.end_address));
+    if (ann.address_range.has_value()) {
+      const auto &range = *ann.address_range;
+      dict_sp->AddItem("start_address",
+                       std::make_shared<StructuredData::UnsignedInteger>(
+                           range.GetBaseAddress().GetFileAddress()));
+      dict_sp->AddItem(
+          "end_address",
+          std::make_shared<StructuredData::UnsignedInteger>(
+              range.GetBaseAddress().GetFileAddress() + range.GetByteSize()));
+    }
     dict_sp->AddItem(
         "register_kind",
         std::make_shared<StructuredData::UnsignedInteger>(ann.register_kind));

lldb/source/Core/Disassembler.cpp

@@ -408,13 +408,6 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
     if (loc.empty())
       continue;
 
-    lldb::addr_t start_addr = inst.GetAddress().GetFileAddress();
-    lldb::addr_t end_addr = LLDB_INVALID_ADDRESS;
-    if (entry.file_range.has_value()) {
-      start_addr = entry.file_range->GetBaseAddress().GetFileAddress();
-      end_addr = start_addr + entry.file_range->GetByteSize();
-    }
-
     std::optional<std::string> decl_file;
     std::optional<uint32_t> decl_line;
     std::optional<std::string> type_name;
@@ -432,9 +425,9 @@ VariableAnnotator::AnnotateStructured(Instruction &inst, Target &target,
 
     Current.try_emplace(v->GetID(),
                         VariableAnnotation{std::string(name), std::string(loc),
-                                           start_addr, end_addr, true,
-                                           entry.expr->GetRegisterKind(),
-                                           decl_file, decl_line, type_name});
+                                           true, entry.expr->GetRegisterKind(),
+                                           entry.file_range, decl_file,
+                                           decl_line, type_name});
   }
 
   // Diff Live_ → Current.