GCF

Author: Jlalond

lldb/include/lldb/Utility/RangeMap.h

@@ -380,24 +380,24 @@ template <typename B, typename S, unsigned N = 0> class RangeVector {
     return nullptr;
   }
 
-const Entry* FindEntryThatIntersects(const Entry &range) const {
-  #ifdef ASSERT_RANGEMAP_ARE_SORTED
-      assert(IsSorted());
-  #endif
-      if (!m_entries.empty()) {
-        typename Collection::const_iterator begin = m_entries.begin();
-        typename Collection::const_iterator end = m_entries.end();
-        typename Collection::const_iterator pos =
-            std::lower_bound(begin, end, range, BaseLessThan);
-  
-        while (pos != begin && pos[-1].DoesIntersect(range))
-          --pos;
-  
-        if (pos != end && pos->DoesIntersect(range))
-          return &(*pos);
-      }
-      return nullptr;
+  const Entry *FindEntryThatIntersects(const Entry &range) const {
+#ifdef ASSERT_RANGEMAP_ARE_SORTED
+    assert(IsSorted());
+#endif
+    if (!m_entries.empty()) {
+      typename Collection::const_iterator begin = m_entries.begin();
+      typename Collection::const_iterator end = m_entries.end();
+      typename Collection::const_iterator pos =
+          std::lower_bound(begin, end, range, BaseLessThan);
+
+      while (pos != begin && pos[-1].DoesIntersect(range))
+        --pos;
+
+      if (pos != end && pos->DoesIntersect(range))
+        return &(*pos);
     }
+    return nullptr;
+  }
 
   using const_iterator = typename Collection::const_iterator;
   const_iterator begin() const { return m_entries.begin(); }

lldb/source/Target/Process.cpp

@@ -6689,9 +6689,11 @@ 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) {
+// 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();
@@ -6717,8 +6719,8 @@ 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->GetRangeBase() != range.GetRange().GetRangeBase() ||
+          entry->GetRangeEnd() != range.GetRange().GetRangeEnd()) {
         AddRegion(Intersect(range, *entry), true, ranges);
       } else {
         // If they match, add the range directly.