RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-23 12:24:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

llvm-cov: Fix an issue with showing regions but not counts

Browse Source 
In r217746, though it was supposed to be NFC, I broke llvm-cov's
handling of showing regions without showing counts. This should've
shown up in the existing tests, except they were checking debug output
that was displayed regardless of what was actually output. I've moved
the relevant debug output to a more appropriate place so that the
tests catch this kind of thing.

llvm-svn: 217835
This commit is contained in:
Justin Bogner 2014-09-15 22:12:28 +00:00
parent c596f4f4ed
commit 50e68a6de5
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tools/llvm-cov/showRegionMarkers.cpp
View File

@ -1,4 +1,4 @@
// RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %S/Inputs/regionMarkers.profdata -show-regions -dump -filename-equivalence %s | FileCheck %s
// RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %S/Inputs/regionMarkers.profdata -show-regions -dump -filename-equivalence %s 2>&1 | FileCheck %s
int main() { // CHECK: Marker at [[@LINE]]:12 = 1
int x = 0;

34
tools/llvm-cov/SourceCoverageView.cpp
View File

@ -118,6 +118,13 @@ void SourceCoverageView::renderRegionMarkers(raw_ostream &OS,
Buffer.clear();
}
OS << "\n";
if (Options.Debug) {
for (const auto &Region : Regions) {
errs() << "Marker at " << Region.Line << ":" << Region.Column << " = "
<< Region.ExecutionCount << "\n";
}
}
}
/// \brief Insert a new highlighting range into the line's highlighting ranges
@ -316,17 +323,24 @@ void SourceCoverageView::render(raw_ostream &OS, unsigned Offset) {
}
}
void
SourceCoverageView::createLineCoverageInfo(SourceCoverageDataManager &Data) {
void SourceCoverageView::setUpVisibleRange(SourceCoverageDataManager &Data) {
auto CountedRegions = Data.getSourceRegions();
if (!CountedRegions.size())
return;
LineOffset = CountedRegions.front().LineStart;
LineStats.resize(CountedRegions.front().LineEnd - LineOffset + 1);
unsigned Start = CountedRegions.front().LineStart, End = 0;
for (const auto &CR : CountedRegions) {
Start = std::min(Start, CR.LineStart);
End = std::max(End, CR.LineEnd);
}
LineOffset = Start;
LineStats.resize(End - Start + 1);
}
void
SourceCoverageView::createLineCoverageInfo(SourceCoverageDataManager &Data) {
auto CountedRegions = Data.getSourceRegions();
for (const auto &CR : CountedRegions) {
if (CR.LineEnd > LineStats.size())
LineStats.resize(CR.LineEnd - LineOffset + 1);
if (CR.Kind == coverage::CounterMappingRegion::SkippedRegion) {
// Reset the line stats for skipped regions.
for (unsigned Line = CR.LineStart; Line <= CR.LineEnd;
@ -395,16 +409,10 @@ void SourceCoverageView::createRegionMarkers(SourceCoverageDataManager &Data) {
if (CR.Kind != coverage::CounterMappingRegion::SkippedRegion)
Markers.push_back(
RegionMarker(CR.LineStart, CR.ColumnStart, CR.ExecutionCount));
if (Options.Debug) {
for (const auto &Marker : Markers) {
outs() << "Marker at " << Marker.Line << ":" << Marker.Column << " = "
<< Marker.ExecutionCount << "\n";
}
}
}
void SourceCoverageView::load(SourceCoverageDataManager &Data) {
setUpVisibleRange(Data);
if (Options.ShowLineStats)
createLineCoverageInfo(Data);
if (Options.Colors)

3
tools/llvm-cov/SourceCoverageView.h
View File

@ -119,6 +119,9 @@ private:
std::vector<RegionMarker> Markers;
StringRef FunctionName;
/// \brief Initialize the visible source range for this view.
void setUpVisibleRange(SourceCoverageDataManager &Data);
/// \brief Create the line coverage information using the coverage data.
void createLineCoverageInfo(SourceCoverageDataManager &Data);