mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-25 13:24:46 +00:00
llvm-cov: Rename MappingRegion to coverage::CountedRegion (NFC)
This name was too similar to CoverageMappingRegion, and the type really belongs in the coverage library anyway. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217416 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -21,11 +21,11 @@ FunctionCoverageSummary
|
||||
FunctionCoverageSummary::get(const FunctionCoverageMapping &Function) {
|
||||
// Compute the region coverage
|
||||
size_t NumCodeRegions = 0, CoveredRegions = 0;
|
||||
for (auto &Region : Function.MappingRegions) {
|
||||
if (Region.Kind != CounterMappingRegion::CodeRegion)
|
||||
for (auto &CR : Function.CountedRegions) {
|
||||
if (CR.Kind != CounterMappingRegion::CodeRegion)
|
||||
continue;
|
||||
++NumCodeRegions;
|
||||
if (Region.ExecutionCount != 0)
|
||||
if (CR.ExecutionCount != 0)
|
||||
++CoveredRegions;
|
||||
}
|
||||
|
||||
@@ -37,27 +37,27 @@ FunctionCoverageSummary::get(const FunctionCoverageMapping &Function) {
|
||||
// in that particular file
|
||||
unsigned LineStart = std::numeric_limits<unsigned>::max();
|
||||
unsigned LineEnd = 0;
|
||||
for (auto &Region : Function.MappingRegions) {
|
||||
if (Region.FileID != FileID)
|
||||
for (auto &CR : Function.CountedRegions) {
|
||||
if (CR.FileID != FileID)
|
||||
continue;
|
||||
LineStart = std::min(LineStart, Region.LineStart);
|
||||
LineEnd = std::max(LineEnd, Region.LineEnd);
|
||||
LineStart = std::min(LineStart, CR.LineStart);
|
||||
LineEnd = std::max(LineEnd, CR.LineEnd);
|
||||
}
|
||||
unsigned LineCount = LineEnd - LineStart + 1;
|
||||
|
||||
// Get counters
|
||||
llvm::SmallVector<uint64_t, 16> ExecutionCounts;
|
||||
ExecutionCounts.resize(LineCount, 0);
|
||||
for (auto &Region : Function.MappingRegions) {
|
||||
if (Region.FileID != FileID)
|
||||
for (auto &CR : Function.CountedRegions) {
|
||||
if (CR.FileID != FileID)
|
||||
continue;
|
||||
// Ignore the lines that were skipped by the preprocessor.
|
||||
auto ExecutionCount = Region.ExecutionCount;
|
||||
if (Region.Kind == MappingRegion::SkippedRegion) {
|
||||
LineCount -= Region.LineEnd - Region.LineStart + 1;
|
||||
auto ExecutionCount = CR.ExecutionCount;
|
||||
if (CR.Kind == CounterMappingRegion::SkippedRegion) {
|
||||
LineCount -= CR.LineEnd - CR.LineStart + 1;
|
||||
ExecutionCount = 1;
|
||||
}
|
||||
for (unsigned I = Region.LineStart; I <= Region.LineEnd; ++I)
|
||||
for (unsigned I = CR.LineStart; I <= CR.LineEnd; ++I)
|
||||
ExecutionCounts[I - LineStart] = ExecutionCount;
|
||||
}
|
||||
CoveredLines += LineCount - std::count(ExecutionCounts.begin(),
|
||||
|
Reference in New Issue
Block a user