[PATCH] D44772: [DWARF] Simplify DWARFAddressRange::{intersects, contains}.

Fangrui Song via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Mon Mar 26 13:51:56 PDT 2018


MaskRay updated this revision to Diff 139846.
MaskRay added a comment.

Make debug/unittests/DebugInfo/DWARF/DebugInfoDWARFTests pass


Repository:
  rL LLVM

https://reviews.llvm.org/D44772

Files:
  include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
  unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp


Index: unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
===================================================================
--- unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
+++ unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
@@ -2921,8 +2921,6 @@
   //----------------------------------------------------------------------
   // Test ranges that start inside Range
   //----------------------------------------------------------------------
-  // empty in range
-  AssertRangesDontIntersect(R, {0x11, 0x11});
   // all in Range
   AssertRangesIntersect(R, {0x11, 0x1f});
   // ends at end of Range
Index: include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
===================================================================
--- include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
+++ include/llvm/DebugInfo/DWARF/DWARFAddressRange.h
@@ -36,17 +36,14 @@
 
   /// Returns true if [LowPC, HighPC) intersects with [RHS.LowPC, RHS.HighPC).
   bool intersects(const DWARFAddressRange &RHS) const {
-    // Empty ranges can't intersect.
-    if (LowPC == HighPC || RHS.LowPC == RHS.HighPC)
-      return false;
-    return (LowPC < RHS.HighPC) && (HighPC > RHS.LowPC);
+    assert(valid() && RHS.valid());
+    return LowPC < RHS.HighPC && RHS.LowPC < HighPC;
   }
 
   /// Returns true if [LowPC, HighPC) fully contains [RHS.LowPC, RHS.HighPC).
   bool contains(const DWARFAddressRange &RHS) const {
-    if (LowPC <= RHS.LowPC && RHS.LowPC <= HighPC)
-      return LowPC <= RHS.HighPC && RHS.HighPC <= HighPC;
-    return false;
+    assert(valid() && RHS.valid());
+    return LowPC <= RHS.LowPC && RHS.HighPC <= HighPC;
   }
 
   void dump(raw_ostream &OS, uint32_t AddressSize,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44772.139846.patch
Type: text/x-patch
Size: 1676 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180326/3d6403d4/attachment.bin>


More information about the llvm-commits mailing list