diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/test/tools/llvm-cov/showExpansions.cpp | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-cov/CodeCoverage.cpp | 24 | ||||
| -rw-r--r-- | llvm/tools/llvm-cov/SourceCoverageView.cpp | 4 |
3 files changed, 7 insertions, 27 deletions
diff --git a/llvm/test/tools/llvm-cov/showExpansions.cpp b/llvm/test/tools/llvm-cov/showExpansions.cpp index 52d33e99c6c..610d5009531 100644 --- a/llvm/test/tools/llvm-cov/showExpansions.cpp +++ b/llvm/test/tools/llvm-cov/showExpansions.cpp @@ -23,9 +23,9 @@ int main(int argc, const char *argv[]) { return 0; } -// CHECK: Expansion of {{[0-9]+}}:13 -> 18 @ {{[0-9]+}}, 22:5 -// CHECK: Expansion of {{[0-9]+}}:4 -> 5 @ {{[0-9]+}}, 15:7 -// CHECK: Expansion of {{[0-9]+}}:7 -> 10 @ {{[0-9]+}}, 17:7 +// CHECK: Expansion at line 22, 5 -> 17 +// CHECK: Expansion at line 15, 7 -> 24 +// CHECK: Expansion at line 17, 7 -> 20 // llvm-cov doesn't work on big endian yet // XFAIL: powerpc64-, s390x, mips-, mips64-, sparc diff --git a/llvm/tools/llvm-cov/CodeCoverage.cpp b/llvm/tools/llvm-cov/CodeCoverage.cpp index eef4185522e..73ab317025c 100644 --- a/llvm/tools/llvm-cov/CodeCoverage.cpp +++ b/llvm/tools/llvm-cov/CodeCoverage.cpp @@ -190,22 +190,6 @@ CodeCoverageTool::getSourceFile(StringRef SourceFile) { 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) { if (CompareFilenamesOnly) return sys::path::filename(A).equals_lower(sys::path::filename(B)); @@ -270,14 +254,6 @@ CodeCoverageTool::findMainViewFileID(const FunctionCoverageMapping &Function, void CodeCoverageTool::createExpansionSubView( const CountedRegion &ExpandedRegion, 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 = getSourceFile(Function.Filenames[ExpandedRegion.ExpandedFileID]); if (!SourceBuffer) diff --git a/llvm/tools/llvm-cov/SourceCoverageView.cpp b/llvm/tools/llvm-cov/SourceCoverageView.cpp index 2a212e5173d..2ad3e145198 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageView.cpp @@ -235,6 +235,10 @@ void SourceCoverageView::render(raw_ostream &OS, bool WholeFile, OS << "\n"; } // Render the child subview + if (Options.Debug) + errs() << "Expansion at line " << NextESV->getLine() << ", " + << NextESV->getStartCol() << " -> " << NextESV->getEndCol() + << "\n"; NextESV->View->render(OS, false, NestedIndent); RenderedSubView = true; } |
