From 9cbf80afc836c800fb7600e282afe4ceb9e66cfc Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Mon, 19 Sep 2016 00:38:25 +0000 Subject: [PATCH] [llvm-cov] Make a helper method static for re-use (NFC) llvm-svn: 281876 --- llvm/tools/llvm-cov/CoverageReport.cpp | 7 ++++--- llvm/tools/llvm-cov/CoverageReport.h | 6 +++--- llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/llvm/tools/llvm-cov/CoverageReport.cpp b/llvm/tools/llvm-cov/CoverageReport.cpp index e70cce40a987..0d34722eae58 100644 --- a/llvm/tools/llvm-cov/CoverageReport.cpp +++ b/llvm/tools/llvm-cov/CoverageReport.cpp @@ -259,8 +259,9 @@ void CoverageReport::renderFunctionReports(ArrayRef Files, } std::vector -CoverageReport::prepareFileReports(FileCoverageSummary &Totals, - ArrayRef Files) const { +CoverageReport::prepareFileReports(const coverage::CoverageMapping &Coverage, + FileCoverageSummary &Totals, + ArrayRef Files) { std::vector FileReports; unsigned LCP = 0; if (Files.size() > 1) @@ -304,7 +305,7 @@ void CoverageReport::renderFileReports(raw_ostream &OS) const { void CoverageReport::renderFileReports(raw_ostream &OS, ArrayRef Files) const { FileCoverageSummary Totals("TOTAL"); - auto FileReports = prepareFileReports(Totals, Files); + auto FileReports = prepareFileReports(Coverage, Totals, Files); std::vector Filenames; for (const FileCoverageSummary &FCS : FileReports) diff --git a/llvm/tools/llvm-cov/CoverageReport.h b/llvm/tools/llvm-cov/CoverageReport.h index 7a06954adfe9..37bb842f13d8 100644 --- a/llvm/tools/llvm-cov/CoverageReport.h +++ b/llvm/tools/llvm-cov/CoverageReport.h @@ -35,9 +35,9 @@ public: void renderFunctionReports(ArrayRef Files, raw_ostream &OS); /// Prepare file reports for the files specified in \p Files. - std::vector - prepareFileReports(FileCoverageSummary &Totals, - ArrayRef Files) const; + static std::vector + prepareFileReports(const coverage::CoverageMapping &Coverage, + FileCoverageSummary &Totals, ArrayRef Files); /// Render file reports for every unique file in the coverage mapping. void renderFileReports(raw_ostream &OS) const; diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index 1ef3219b1030..cb9760ad7c9f 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -375,11 +375,11 @@ Error CoveragePrinterHTML::createIndexFile( OSRef << tag(CreatedTimeTag, escape(Opts.CreatedTimeStr, Opts)); // Emit a table containing links to reports for each file in the covmapping. - CoverageReport Report(Opts, Coverage); OSRef << BeginCenteredDiv << BeginTable; emitColumnLabelsForIndex(OSRef); FileCoverageSummary Totals("TOTALS"); - auto FileReports = Report.prepareFileReports(Totals, SourceFiles); + auto FileReports = + CoverageReport::prepareFileReports(Coverage, Totals, SourceFiles); for (unsigned I = 0, E = FileReports.size(); I < E; ++I) emitFileSummary(OSRef, SourceFiles[I], FileReports[I]); emitFileSummary(OSRef, "Totals", Totals, /*IsTotals=*/true);