[Lldb-commits] [lldb] [lldb] Use the function block as a source for function ranges (PR #117996)

[via lldb-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 871e3dc8d8717bbcf5e3ad44331a21c3417c2639 78b8dabf1ada3d567d3f1a193fdf0cc0f159cb37 --extensions cpp,h -- lldb/include/lldb/Symbol/Function.h lldb/source/Plugins/SymbolFile/Breakpad/SymbolFileBreakpad.cpp lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h lldb/source/Plugins/SymbolFile/NativePDB/SymbolFileNativePDB.cpp lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp lldb/source/Symbol/Function.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index d814b635f2..6f19b264eb 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -3197,10 +3197,9 @@ size_t SymbolFileDWARF::ParseBlocksRecursive(Function &func) {
   if (function_die) {
     // We can't use the file address from the Function object as (in the OSO
     // case) it will already be remapped to the main module.
-    DWARFRangeList ranges =
-            function_die.GetDIE()->GetAttributeAddressRanges(
-                function_die.GetCU(),
-                /*check_hi_lo_pc=*/true);
+    DWARFRangeList ranges = function_die.GetDIE()->GetAttributeAddressRanges(
+        function_die.GetCU(),
+        /*check_hi_lo_pc=*/true);
     lldb::addr_t function_file_addr =
         ranges.GetMinRangeBase(LLDB_INVALID_ADDRESS);
     if (function_file_addr != LLDB_INVALID_ADDRESS)
diff --git a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
index 952c1eb35c..b7854c05d3 100644
--- a/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
+++ b/lldb/source/Plugins/SymbolFile/PDB/SymbolFilePDB.cpp
@@ -420,15 +420,14 @@ static size_t ParseFunctionBlocksForPDBSymbol(
     block->AddRange(Block::Range(
         raw_sym.getVirtualAddress() - func_file_vm_addr, raw_sym.getLength()));
     block->FinalizeRanges();
-
   }
   auto results_up = pdb_symbol->findAllChildren();
   if (!results_up)
     return num_added;
 
   while (auto symbol_up = results_up->getNext()) {
-    num_added += ParseFunctionBlocksForPDBSymbol(func_file_vm_addr,
-                                                 symbol_up.get(), parent_block, false);
+    num_added += ParseFunctionBlocksForPDBSymbol(
+        func_file_vm_addr, symbol_up.get(), parent_block, false);
   }
   return num_added;
 }
diff --git a/lldb/source/Symbol/Function.cpp b/lldb/source/Symbol/Function.cpp
index 0c067a0126..4f07b94635 100644
--- a/lldb/source/Symbol/Function.cpp
+++ b/lldb/source/Symbol/Function.cpp
@@ -282,7 +282,7 @@ Function::Function(CompileUnit *comp_unit, lldb::user_id_t func_uid,
       m_range(CollapseRanges(ranges)), m_prologue_byte_size(0) {
   assert(comp_unit != nullptr);
   lldb::addr_t base_file_addr = m_range.GetBaseAddress().GetFileAddress();
-  for (const AddressRange &range: ranges)
+  for (const AddressRange &range : ranges)
     m_block.AddRange(
         Block::Range(range.GetBaseAddress().GetFileAddress() - base_file_addr,
                      range.GetByteSize()));

``````````

</details>


https://github.com/llvm/llvm-project/pull/117996