[lldb] [disassembler] chore: enhance VariableAnnotator to return structured data: remove braces around single line ifs and cycles

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

Author: n2h9

lldb/source/API/SBInstruction.cpp

@@ -357,23 +357,20 @@ SBInstruction::GetVariableAnnotations(lldb::SBTarget target) {
 
   SBStructuredData result;
 
-  if (!m_opaque_sp || !m_opaque_sp->IsValid() || !target.IsValid()) {
+  if (!m_opaque_sp || !m_opaque_sp->IsValid() || !target.IsValid())
     return result;
-  }
 
   lldb::InstructionSP inst_sp = m_opaque_sp->GetSP();
   lldb::TargetSP target_sp = target.GetSP();
 
-  if (!inst_sp || !target_sp) {
+  if (!inst_sp || !target_sp)
     return result;
-  }
 
   const Address &addr = inst_sp->GetAddress();
   ModuleSP module_sp = addr.GetModule();
 
-  if (!module_sp) {
+  if (!module_sp)
     return result;
-  }
 
   VariableAnnotator annotator;
   std::vector<VariableAnnotation> annotations =
@@ -396,17 +393,14 @@ SBInstruction::GetVariableAnnotations(lldb::SBTarget target) {
     dict_sp->AddItem(
         "register_kind",
         std::make_shared<StructuredData::UnsignedInteger>(ann.register_kind));
-    if (ann.decl_file.has_value()) {
+    if (ann.decl_file.has_value())
       dict_sp->AddStringItem("decl_file", *ann.decl_file);
-    }
-    if (ann.decl_line.has_value()) {
+    if (ann.decl_line.has_value())
       dict_sp->AddItem(
           "decl_line",
           std::make_shared<StructuredData::UnsignedInteger>(*ann.decl_line));
-    }
-    if (ann.type_name.has_value()) {
+    if (ann.type_name.has_value())
       dict_sp->AddStringItem("type_name", *ann.type_name);
-    }
 
     array_sp->AddItem(dict_sp);
   }

lldb/source/Core/Disassembler.cpp

@@ -330,9 +330,8 @@ VariableAnnotator::annotateStructured(Instruction &inst, Target &target,
 
   // If we lost module context, mark all live variables as undefined.
   if (!module_sp) {
-    for (const auto &KV : Live_) {
+    for (const auto &KV : Live_)
       annotations.push_back(createAnnotation(KV.second, false, kUndefLocation));
-    }
     Live_.clear();
     return annotations;
   }
@@ -344,9 +343,8 @@ VariableAnnotator::annotateStructured(Instruction &inst, Target &target,
   if (!module_sp->ResolveSymbolContextForAddress(iaddr, mask, sc) ||
       !sc.function) {
     // No function context: everything dies here.
-    for (const auto &KV : Live_) {
+    for (const auto &KV : Live_)
       annotations.push_back(createAnnotation(KV.second, false, kUndefLocation));
-    }
     Live_.clear();
     return annotations;
   }
@@ -416,16 +414,13 @@ VariableAnnotator::annotateStructured(Instruction &inst, Target &target,
     const Declaration &decl = v->GetDeclaration();
     if (decl.GetFile()) {
       decl_file = decl.GetFile().GetFilename().AsCString();
-      if (decl.GetLine() > 0) {
+      if (decl.GetLine() > 0)
         decl_line = decl.GetLine();
-      }
     }
 
-    if (Type *type = v->GetType()) {
-      if (const char *type_str = type->GetName().AsCString()) {
+    if (Type *type = v->GetType())
+      if (const char *type_str = type->GetName().AsCString())
         type_name = type_str;
-      }
-    }
 
     Current.try_emplace(
         v->GetID(), VarState{std::string(name), std::string(loc), start_addr,
@@ -449,11 +444,9 @@ VariableAnnotator::annotateStructured(Instruction &inst, Target &target,
 
   // 2) Ends: anything that was live but is not in Current becomes
   // <kUndefLocation>.
-  for (const auto &KV : Live_) {
-    if (!Current.count(KV.first)) {
+  for (const auto &KV : Live_)
+    if (!Current.count(KV.first))
       annotations.push_back(createAnnotation(KV.second, false, kUndefLocation));
-    }
-  }
 
   // Commit new state.
   Live_ = std::move(Current);