6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

llvm-cov: Make debug output more consistent

Browse Source 
This changes the debug output of the llvm-cov tool to consistently
write to stderr, and moves the highlighting output closer to where
it's relevant.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217838 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2014-09-15 22:23:29 +00:00
parent ccaf6dd1d9
commit 16bd30fa48
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
// RUN: llvm-cov show %S/Inputs/showExpansions.covmapping -instr-profile %S/Inputs/showExpansions.profdata -dump -show-expansions -filename-equivalence %s | FileCheck %s // RUN: llvm-cov show %S/Inputs/showExpansions.covmapping -instr-profile %S/Inputs/showExpansions.profdata -dump -show-expansions -filename-equivalence %s 2>&1 | FileCheck %s
#define DO_SOMETHING_ELSE() \ #define DO_SOMETHING_ELSE() \
do { \ do { \

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

@ -1,4 +1,4 @@
// RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -filename-equivalence %s | FileCheck %s // RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -dump -filename-equivalence %s 2>&1 | FileCheck %s
void func() { void func() {
return; return;

8
tools/llvm-cov/CodeCoverage.cpp
View File

@ -273,7 +273,7 @@ void CodeCoverageTool::createExpansionSubView(
auto ExpandedLines = findExpandedFileInterestingLineRange( auto ExpandedLines = findExpandedFileInterestingLineRange(
ExpandedRegion.ExpandedFileID, Function); ExpandedRegion.ExpandedFileID, Function);
if (ViewOpts.Debug) if (ViewOpts.Debug)
llvm::outs() << "Expansion of " << ExpandedRegion.ExpandedFileID << ":" llvm::errs() << "Expansion of " << ExpandedRegion.ExpandedFileID << ":"
<< ExpandedLines.first << " -> " << ExpandedLines.second << ExpandedLines.first << " -> " << ExpandedLines.second
<< " @ " << ExpandedRegion.FileID << ", " << " @ " << ExpandedRegion.FileID << ", "
<< ExpandedRegion.LineStart << ":" << ExpandedRegion.LineStart << ":"
@ -397,14 +397,14 @@ bool CodeCoverageTool::load() {
for (const auto &R : I.MappingRegions) { for (const auto &R : I.MappingRegions) {
// Compute the values of mapped regions // Compute the values of mapped regions
if (ViewOpts.Debug) { if (ViewOpts.Debug) {
outs() << "File " << R.FileID << "| " << R.LineStart << ":" errs() << "File " << R.FileID << "| " << R.LineStart << ":"
<< R.ColumnStart << " -> " << R.LineEnd << ":" << R.ColumnEnd << R.ColumnStart << " -> " << R.LineEnd << ":" << R.ColumnEnd
<< " = "; << " = ";
Ctx.dump(R.Count); Ctx.dump(R.Count);
if (R.Kind == CounterMappingRegion::ExpansionRegion) { if (R.Kind == CounterMappingRegion::ExpansionRegion) {
outs() << " (Expanded file id = " << R.ExpandedFileID << ") "; errs() << " (Expanded file id = " << R.ExpandedFileID << ") ";
} }
outs() << "\n"; errs() << "\n";
} }
ErrorOr<int64_t> ExecutionCount = Ctx.evaluate(R.Count); ErrorOr<int64_t> ExecutionCount = Ctx.evaluate(R.Count);
if (ExecutionCount) { if (ExecutionCount) {

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

@ -49,6 +49,18 @@ void SourceCoverageView::renderLine(raw_ostream &OS, StringRef Line,
// Show the rest of the line // Show the rest of the line
OS << Line.substr(Start - 1, Line.size() - Start + 1); OS << Line.substr(Start - 1, Line.size() - Start + 1);
OS << "\n"; OS << "\n";
if (Options.Debug) {
for (const auto &Range : Ranges) {
errs() << "Highlighted line " << Range.Line << ", " << Range.ColumnStart
<< " -> ";
if (Range.ColumnEnd == std::numeric_limits<unsigned>::max()) {
errs() << "?\n";
} else {
errs() << Range.ColumnEnd << "\n";
}
}
}
} }
void SourceCoverageView::renderOffset(raw_ostream &OS, unsigned I) { void SourceCoverageView::renderOffset(raw_ostream &OS, unsigned I) {
@ -390,18 +402,6 @@ SourceCoverageView::createHighlightRanges(SourceCoverageDataManager &Data) {
} }
std::sort(HighlightRanges.begin(), HighlightRanges.end()); std::sort(HighlightRanges.begin(), HighlightRanges.end());
if (Options.Debug) {
for (const auto &Range : HighlightRanges) {
outs() << "Highlighted line " << Range.Line << ", " << Range.ColumnStart
<< " -> ";
if (Range.ColumnEnd == std::numeric_limits<unsigned>::max()) {
outs() << "?\n";
} else {
outs() << Range.ColumnEnd << "\n";
}
}
}
} }
void SourceCoverageView::createRegionMarkers(SourceCoverageDataManager &Data) { void SourceCoverageView::createRegionMarkers(SourceCoverageDataManager &Data) {