RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[DWARF] Fix DWARFVerifier::DieRangeInfo::intersects

Browse Source 
It was incorrect if RHS had more than 1 ranges and one of the ranges interacted with *this

llvm-svn: 358376
This commit is contained in:
Fangrui Song 2019-04-15 08:30:10 +00:00
parent fcb8e51b60
commit 97fd701ef4
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/DebugInfo/DWARF/DWARFVerifier.cpp
View File

@ -85,23 +85,16 @@ bool DWARFVerifier::DieRangeInfo::contains(const DieRangeInfo &RHS) const {
} }
bool DWARFVerifier::DieRangeInfo::intersects(const DieRangeInfo &RHS) const { bool DWARFVerifier::DieRangeInfo::intersects(const DieRangeInfo &RHS) const {
if (Ranges.empty() || RHS.Ranges.empty()) auto I1 = Ranges.begin(), E1 = Ranges.end();
return false; auto I2 = RHS.Ranges.begin(), E2 = RHS.Ranges.end();
while (I1 != E1 && I2 != E2) {
auto End = Ranges.end(); if (I1->intersects(*I2))
auto Iter = findRange(RHS.Ranges.front()); return true;
for (const auto &R : RHS.Ranges) { if (I1->LowPC < I2->LowPC)
if (Iter == End) ++I1;
return false; else
if (R.HighPC <= Iter->LowPC) ++I2;
continue;
while (Iter != End) {
if (Iter->intersects(R))
return true;
++Iter;
}
} }
return false; return false;
} }

3
unittests/DebugInfo/DWARF/DWARFDebugInfoTest.cpp
View File

@ -3188,6 +3188,9 @@ TEST(DWARFDebugInfo, TestDWARFDieRangeInfoIntersects) {
AssertRangesIntersect(Ranges, {{0x3f, 0x40}}); AssertRangesIntersect(Ranges, {{0x3f, 0x40}});
// Test range that starts at end of second range // Test range that starts at end of second range
AssertRangesDontIntersect(Ranges, {{0x40, 0x41}}); AssertRangesDontIntersect(Ranges, {{0x40, 0x41}});
AssertRangesDontIntersect(Ranges, {{0x20, 0x21}, {0x2f, 0x30}});
AssertRangesIntersect(Ranges, {{0x20, 0x21}, {0x2f, 0x31}});
} }
} // end anonymous namespace } // end anonymous namespace