Clean up code duplication and use the existing functions on Range

Author: Jlalond

lldb/source/Target/Process.cpp

@@ -6691,19 +6691,12 @@ static void GetCoreFileSaveRangesStackOnly(Process &process,
 
 // TODO: We should refactor CoreFileMemoryRanges to use the lldb range type, and
 // then add an intersect method on it, or MemoryRegionInfo.
-static MemoryRegionInfo
-Intersect(const MemoryRegionInfo &lhs,
-          const Range<lldb::addr_t, lldb::addr_t> &rhs) {
-  const lldb::addr_t lhs_base = lhs.GetRange().GetRangeBase();
-  const lldb::addr_t rhs_base = rhs.GetRangeBase();
-  const lldb::addr_t lhs_end = lhs.GetRange().GetRangeEnd();
-  const lldb::addr_t rhs_end = rhs.GetRangeEnd();
+static MemoryRegionInfo Intersect(const MemoryRegionInfo &lhs,
+                                  const MemoryRegionInfo::RangeType &rhs) {
 
   MemoryRegionInfo region_info;
   region_info.SetLLDBPermissions(lhs.GetLLDBPermissions());
-  auto &range = region_info.GetRange();
-  range.SetRangeBase(std::max(lhs_base, rhs_base));
-  range.SetRangeEnd(std::min(lhs_end, rhs_end));
+  region_info.GetRange() = lhs.GetRange().Intersect(rhs);
 
   return region_info;
 }
@@ -6719,8 +6712,7 @@ static void GetUserSpecifiedCoreFileSaveRanges(Process &process,
   for (const auto &range : regions) {
     auto *entry = option_ranges.FindEntryThatIntersects(range.GetRange());
     if (entry) {
-      if (entry->GetRangeBase() != range.GetRange().GetRangeBase() ||
-          entry->GetRangeEnd() != range.GetRange().GetRangeEnd()) {
+      if (*entry != range.GetRange()) {
         AddRegion(Intersect(range, *entry), true, ranges);
       } else {
         // If they match, add the range directly.

lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidumpYaml.py

@@ -33,7 +33,7 @@ def test_saving_sub_memory_range(self):
         options.SetStyle(lldb.eSaveCoreCustomOnly)
 
         size = 8
-        begin = 0x7FFF12A84030
+        begin = 0x2000
         end = begin + size
         custom_range = lldb.SBMemoryRegionInfo("", begin, end, 3, True, False)
         options.AddMemoryRegionToSave(custom_range)
@@ -66,8 +66,8 @@ def test_saving_super_memory_range(self):
         options.SetPluginName("minidump")
         options.SetStyle(lldb.eSaveCoreCustomOnly)
 
-        size = 0x2FD0
-        begin = 0x7FFF12A84030
+        size = 0x100
+        begin = 0x1000
         end = begin + size
         custom_range = lldb.SBMemoryRegionInfo("", begin - 16, end + 16, 3, True, False)
         options.AddMemoryRegionToSave(custom_range)
@@ -94,8 +94,8 @@ def test_region_that_goes_out_of_bounds(self):
         options.SetPluginName("minidump")
         options.SetStyle(lldb.eSaveCoreCustomOnly)
 
-        size = 1024
-        begin = 0x00007FFF12A8FFFF
+        size = 0x120
+        begin = 0x1000
         end = begin + size
         custom_range = lldb.SBMemoryRegionInfo("", begin, end, 3, True, False)
         options.AddMemoryRegionToSave(custom_range)
@@ -126,8 +126,8 @@ def test_region_that_starts_out_of_bounds(self):
         options.SetPluginName("minidump")
         options.SetStyle(lldb.eSaveCoreCustomOnly)
 
-        size = 0x00000020
-        begin = 0x00007FFF12A8FFFF
+        size = 0x20
+        begin = 0x2000
         end = begin + size
         custom_range = lldb.SBMemoryRegionInfo("", begin - 16, end, 3, True, False)
         options.AddMemoryRegionToSave(custom_range)

lldb/test/API/functionalities/process_save_core_minidump/minidump_mem64.yaml

@@ -20,16 +20,16 @@ Streams:
           Content:         ''
   - Type:            Memory64List
     Memory Ranges:
-      - Start of Memory Range: 0x7FFF12A84030
-        Data Size:       0x2FD0
+      - Start of Memory Range: 0x1000
+        Data Size:       0x100
         Content :        ''
-      - Start of Memory Range: 0x00007fff12a87000
-        Data Size:       0x00000018
+      - Start of Memory Range: 0x2000
+        Data Size:       0x20
         Content :        ''
-      - Start of Memory Range: 0x00007fff12a87018
-        Data Size:       0x00000400
+      - Start of Memory Range: 0x3000
+        Data Size:       0x4000
         Content :        ''
-      - Start of Memory Range: 0x00007fff12a8ffff
-        Data Size:       0x00000020
+      - Start of Memory Range: 0x5000
+        Data Size:       0x2000
         Content :        ''
 ...