diff options
author | Vedant Kumar <vsk@apple.com> | 2016-06-28 16:12:18 +0000 |
---|---|---|
committer | Vedant Kumar <vsk@apple.com> | 2016-06-28 16:12:18 +0000 |
commit | 75f03af5429fb32fbbf90e83fcb795c531c5326c (patch) | |
tree | d4b6b92eef26b79d0ae384258c6be742ce0a5faf /tools | |
parent | c5fab6a8fd63d0a46d408ff925ae43bf436dd622 (diff) |
[llvm-cov] Avoid copying file paths multiple times (NFC)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@274027 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/llvm-cov/CodeCoverage.cpp | 15 | ||||
-rw-r--r-- | tools/llvm-cov/CoverageReport.cpp | 2 | ||||
-rw-r--r-- | tools/llvm-cov/CoverageReport.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp index 84318e3cd37..270a3408b7c 100644 --- a/tools/llvm-cov/CodeCoverage.cpp +++ b/tools/llvm-cov/CodeCoverage.cpp @@ -48,6 +48,9 @@ public: /// \brief Print the error message to the error output stream. void error(const Twine &Message, StringRef Whence = ""); + /// \brief Append a reference to a private copy of \p Path into SourceFiles. + void addCollectedPath(const std::string &Path); + /// \brief Return a memory buffer for the given source file. ErrorOr<const MemoryBuffer &> getSourceFile(StringRef SourceFile); @@ -81,12 +84,15 @@ public: CoverageViewOptions ViewOpts; std::string PGOFilename; CoverageFiltersMatchAll Filters; - std::vector<std::string> SourceFiles; + std::vector<StringRef> SourceFiles; std::vector<std::pair<std::string, std::unique_ptr<MemoryBuffer>>> LoadedSourceFiles; bool CompareFilenamesOnly; StringMap<std::string> RemappedFilenames; std::string CoverageArch; + +private: + std::vector<std::string> CollectedPaths; }; } @@ -97,6 +103,11 @@ void CodeCoverageTool::error(const Twine &Message, StringRef Whence) { errs() << Message << "\n"; } +void CodeCoverageTool::addCollectedPath(const std::string &Path) { + CollectedPaths.push_back(Path); + SourceFiles.emplace_back(CollectedPaths.back()); +} + ErrorOr<const MemoryBuffer &> CodeCoverageTool::getSourceFile(StringRef SourceFile) { // If we've remapped filenames, look up the real location for this file. @@ -356,7 +367,7 @@ int CodeCoverageTool::run(Command Cmd, int argc, const char **argv) { errs() << "error: " << File << ": " << EC.message(); return 1; } - SourceFiles.push_back(Path.str()); + addCollectedPath(Path.str()); } return 0; }; diff --git a/tools/llvm-cov/CoverageReport.cpp b/tools/llvm-cov/CoverageReport.cpp index ed01a2e154f..10e53b3f1f7 100644 --- a/tools/llvm-cov/CoverageReport.cpp +++ b/tools/llvm-cov/CoverageReport.cpp @@ -171,7 +171,7 @@ void CoverageReport::render(const FunctionCoverageSummary &Function, OS << "\n"; } -void CoverageReport::renderFunctionReports(ArrayRef<std::string> Files, +void CoverageReport::renderFunctionReports(ArrayRef<StringRef> Files, raw_ostream &OS) { adjustColumnWidths(Coverage.get()); bool isFirst = true; diff --git a/tools/llvm-cov/CoverageReport.h b/tools/llvm-cov/CoverageReport.h index 7ec3df90b8f..bb3d734b52a 100644 --- a/tools/llvm-cov/CoverageReport.h +++ b/tools/llvm-cov/CoverageReport.h @@ -32,7 +32,7 @@ public: std::unique_ptr<coverage::CoverageMapping> Coverage) : Options(Options), Coverage(std::move(Coverage)) {} - void renderFunctionReports(ArrayRef<std::string> Files, raw_ostream &OS); + void renderFunctionReports(ArrayRef<StringRef> Files, raw_ostream &OS); void renderFileReports(raw_ostream &OS); }; |