replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Coverage] Use the most-recent completed region count (PR35437) 

This is a fix for the coverage segment builder.

If multiple regions must be popped off the active stack at once, and
more than one of them end at the same location, emit a segment using the
count from the most-recent completed region.

Fixes PR35437, rdar://35760630

Testing: invoked llvm-cov on a stage2 build of clang, additional unit
tests, check-profile

llvm-svn: 319391
This commit is contained in:
Vedant Kumar 2017-11-30 00:28:23 +00:00
parent 9e3175bb6b
commit 80fbb85555
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
View File

@ -388,6 +388,12 @@ class SegmentBuilder {
if (CompletedSegmentLoc == CompletedRegion->endLoc())
continue;
// Use the count from the next completed region if it ends at the same
// location.
if (I + 1 < E &&
CompletedRegion->endLoc() == ActiveRegions[I + 1]->endLoc())
CompletedRegion = ActiveRegions[I + 1];
startSegment(*CompletedRegion, CompletedSegmentLoc, false);
}

4
llvm/test/tools/llvm-cov/deferred-region.cpp
View File

@ -45,7 +45,7 @@ void while_loop() {
break; // CHECK: [[@LINE]]|{{ +}}1|
// CHECK: [[@LINE]]|{{ +}}0|
while (++x < 5) {} // CHECK: [[@LINE]]|{{ +}}0|
} // CHECK: [[@LINE]]|{{ +}}1|
} // CHECK: [[@LINE]]|{{ +}}0|
if (x == 0) // CHECK: [[@LINE]]|{{ +}}1|
throw Error(); // CHECK: [[@LINE]]|{{ +}}0|
@ -97,6 +97,8 @@ int main() {
// MARKER-NEXT: Highlighted line 47, 14 -> 21
// MARKER-NEXT: Highlighted line 47, 21 -> 23
// MARKER-NEXT: Highlighted line 47, 23 -> 25
// MARKER-NEXT: Highlighted line 47, 25 -> ?
// MARKER-NEXT: Highlighted line 48, 1 -> 6
// MARKER-NEXT: Highlighted line 51, 7 -> 20
// MARKER-NEXT: Marker at 53:5 = 1
// MARKER-NEXT: Highlighted line 55, 9 -> 14

26
llvm/unittests/ProfileData/CoverageMappingTest.cpp
View File

@ -466,6 +466,32 @@ TEST_P(CoverageMappingTest, multiple_regions_end_after_parent_ends) {
EXPECT_EQ(CoverageSegment(9, 9, false), Segments[7]);
}
TEST_P(CoverageMappingTest, multiple_completed_segments_at_same_loc) {
ProfileWriter.addRecord({"func1", 0x1234, {0, 1, 2}}, Err);
startFunction("func1", 0x1234);
// PR35437
addCMR(Counter::getCounter(1), "file1", 2, 1, 18, 2);
addCMR(Counter::getCounter(0), "file1", 8, 12, 14, 6);
addCMR(Counter::getCounter(1), "file1", 9, 1, 14, 6);
addCMR(Counter::getCounter(2), "file1", 11, 13, 11, 14);
EXPECT_THAT_ERROR(loadCoverageMapping(), Succeeded());
const auto FunctionRecords = LoadedCoverage->getCoveredFunctions();
const auto &FunctionRecord = *FunctionRecords.begin();
CoverageData Data = LoadedCoverage->getCoverageForFunction(FunctionRecord);
std::vector<CoverageSegment> Segments(Data.begin(), Data.end());
ASSERT_EQ(6U, Segments.size());
EXPECT_EQ(CoverageSegment(2, 1, 1, true), Segments[0]);
EXPECT_EQ(CoverageSegment(8, 12, 0, true), Segments[1]);
EXPECT_EQ(CoverageSegment(9, 1, 1, true), Segments[2]);
EXPECT_EQ(CoverageSegment(11, 13, 2, true), Segments[3]);
// Use count=1 (from 9:1 -> 14:6), not count=0 (from 8:12 -> 14:6).
EXPECT_EQ(CoverageSegment(11, 14, 1, false), Segments[4]);
EXPECT_EQ(CoverageSegment(18, 2, false), Segments[5]);
}
TEST_P(CoverageMappingTest, dont_emit_redundant_segments) {
ProfileWriter.addRecord({"func1", 0x1234, {1, 1}}, Err);
startFunction("func1", 0x1234);