Merge pull request #8747 from bulbazord/sorted-ranges-list-6.0

adrian-prantl · web-flow · commit 9e2362752c95 · 2024-05-13T17:30:04.000-07:00
[lldb][DWARF] Sort ranges list in dwarf 5. (llvm#91343)
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
@@ -1109,6 +1109,7 @@ DWARFUnit::FindRnglistFromOffset(dw_offset_t offset) {
     ranges.Append(DWARFRangeList::Entry(llvm_range.LowPC,
                                         llvm_range.HighPC - llvm_range.LowPC));
   }
+  ranges.Sort();
   return ranges;
 }
 
diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s
@@ -124,12 +124,12 @@ lookup_rnglists2:
 .Lrnglists_table_base0:
         .long   .Ldebug_ranges0-.Lrnglists_table_base0
 .Ldebug_ranges0:
-        .byte   4                       # DW_RLE_offset_pair
-        .uleb128 .Lblock1_begin-rnglists  #   starting offset
-        .uleb128 .Lblock1_end-rnglists    #   ending offset
         .byte   4                       # DW_RLE_offset_pair
         .uleb128 .Lblock2_begin-rnglists  #   starting offset
         .uleb128 .Lblock2_end-rnglists    #   ending offset
+        .byte   4                       # DW_RLE_offset_pair
+        .uleb128 .Lblock1_begin-rnglists  #   starting offset
+        .uleb128 .Lblock1_end-rnglists    #   ending offset
         .byte   0                       # DW_RLE_end_of_list
 .Ldebug_rnglist_table_end0:
 

Original file line number	Diff line number	Diff line change
`@@ -1109,6 +1109,7 @@ DWARFUnit::FindRnglistFromOffset(dw_offset_t offset) {`
`1109`	`1109`	`ranges.Append(DWARFRangeList::Entry(llvm_range.LowPC,`
`1110`	`1110`	`llvm_range.HighPC - llvm_range.LowPC));`
`1111`	`1111`	`}`
	`1112`	`+ ranges.Sort();`
`1112`	`1113`	`return ranges;`
`1113`	`1114`	`}`
`1114`	`1115`