[llvm-cov] Filter away source files that aren't in the coverage mapping
... so that they don't show up in the index. This came up because polly
contains a .git directory and some other unmapped input in its source
dir.
llvm-svn: 282282
diff --git a/llvm/tools/llvm-cov/CodeCoverage.cpp b/llvm/tools/llvm-cov/CodeCoverage.cpp
index 51ac6ef..9230d01 100644
--- a/llvm/tools/llvm-cov/CodeCoverage.cpp
+++ b/llvm/tools/llvm-cov/CodeCoverage.cpp
@@ -332,19 +332,35 @@
if (Mismatched)
warning(utostr(Mismatched) + " functions have mismatched data");
- if (CompareFilenamesOnly) {
- auto CoveredFiles = Coverage.get()->getUniqueSourceFiles();
+ std::vector<StringRef> CoveredFiles = Coverage.get()->getUniqueSourceFiles();
+
+ auto UncoveredFilesIt = SourceFiles.end();
+ if (!CompareFilenamesOnly) {
+ // The user may have specified source files which aren't in the coverage
+ // mapping. Filter these files away.
+ UncoveredFilesIt = std::remove_if(
+ SourceFiles.begin(), SourceFiles.end(), [&](const std::string &SF) {
+ return !std::binary_search(CoveredFiles.begin(), CoveredFiles.end(),
+ SF);
+ });
+ } else {
for (auto &SF : SourceFiles) {
StringRef SFBase = sys::path::filename(SF);
- for (const auto &CF : CoveredFiles)
+ for (const auto &CF : CoveredFiles) {
if (SFBase == sys::path::filename(CF)) {
RemappedFilenames[CF] = SF;
SF = CF;
break;
}
+ }
}
+ UncoveredFilesIt = std::remove_if(
+ SourceFiles.begin(), SourceFiles.end(),
+ [&](const std::string &SF) { return !RemappedFilenames.count(SF); });
}
+ SourceFiles.erase(UncoveredFilesIt, SourceFiles.end());
+
demangleSymbols(*Coverage);
return Coverage;