6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-14 17:34:41 +00:00
Code Issues Projects Releases Wiki Activity

llvm-cov: Push some more debug output into the View (NFC)

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217984 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner 2014-09-17 21:48:52 +00:00
parent 6ba12f9f72
commit 5fbcc30184
3 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,9 @@ int main(int argc, const char *argv[]) {
return 0; return 0;
} }
// CHECK: Expansion of {{[0-9]+}}:13 -> 18 @ {{[0-9]+}}, 22:5 // CHECK: Expansion at line 22, 5 -> 17
// CHECK: Expansion of {{[0-9]+}}:4 -> 5 @ {{[0-9]+}}, 15:7 // CHECK: Expansion at line 15, 7 -> 24
// CHECK: Expansion of {{[0-9]+}}:7 -> 10 @ {{[0-9]+}}, 17:7 // CHECK: Expansion at line 17, 7 -> 20
// llvm-cov doesn't work on big endian yet // llvm-cov doesn't work on big endian yet
// XFAIL: powerpc64-, s390x, mips-, mips64-, sparc // XFAIL: powerpc64-, s390x, mips-, mips64-, sparc

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

@ -190,22 +190,6 @@ CodeCoverageTool::getSourceFile(StringRef SourceFile) {
return *LoadedSourceFiles.back().second; return *LoadedSourceFiles.back().second;
} }
/// \brief Return a line start - line end range which contains
/// all the mapping regions of a given function with a particular file id.
std::pair<unsigned, unsigned>
findExpandedFileInterestingLineRange(unsigned FileID,
const FunctionCoverageMapping &Function) {
unsigned LineStart = std::numeric_limits<unsigned>::max();
unsigned LineEnd = 0;
for (const auto &CR : Function.CountedRegions) {
if (CR.FileID != FileID)
continue;
LineStart = std::min(CR.LineStart, LineStart);
LineEnd = std::max(CR.LineEnd, LineEnd);
}
return std::make_pair(LineStart, LineEnd);
}
bool CodeCoverageTool::equivalentFiles(StringRef A, StringRef B) { bool CodeCoverageTool::equivalentFiles(StringRef A, StringRef B) {
if (CompareFilenamesOnly) if (CompareFilenamesOnly)
return sys::path::filename(A).equals_lower(sys::path::filename(B)); return sys::path::filename(A).equals_lower(sys::path::filename(B));
@ -270,14 +254,6 @@ CodeCoverageTool::findMainViewFileID(const FunctionCoverageMapping &Function,
void CodeCoverageTool::createExpansionSubView( void CodeCoverageTool::createExpansionSubView(
const CountedRegion &ExpandedRegion, const CountedRegion &ExpandedRegion,
const FunctionCoverageMapping &Function, SourceCoverageView &Parent) { const FunctionCoverageMapping &Function, SourceCoverageView &Parent) {
auto ExpandedLines = findExpandedFileInterestingLineRange(
ExpandedRegion.ExpandedFileID, Function);
if (ViewOpts.Debug)
llvm::errs() << "Expansion of " << ExpandedRegion.ExpandedFileID << ":"
<< ExpandedLines.first << " -> " << ExpandedLines.second
<< " @ " << ExpandedRegion.FileID << ", "
<< ExpandedRegion.LineStart << ":"
<< ExpandedRegion.ColumnStart << "\n";
auto SourceBuffer = auto SourceBuffer =
getSourceFile(Function.Filenames[ExpandedRegion.ExpandedFileID]); getSourceFile(Function.Filenames[ExpandedRegion.ExpandedFileID]);
if (!SourceBuffer) if (!SourceBuffer)

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

@ -235,6 +235,10 @@ void SourceCoverageView::render(raw_ostream &OS, bool WholeFile,
OS << "\n"; OS << "\n";
} }
// Render the child subview // Render the child subview
if (Options.Debug)
errs() << "Expansion at line " << NextESV->getLine() << ", "
<< NextESV->getStartCol() << " -> " << NextESV->getEndCol()
<< "\n";
NextESV->View->render(OS, false, NestedIndent); NextESV->View->render(OS, false, NestedIndent);
RenderedSubView = true; RenderedSubView = true;
} }