llvm-cov: Sink some reporting logic into CoverageMapping

This teaches CoverageMapping::getCoveredFunctions to filter to a
particular file and uses that to replace most of the logic found in
llvm-cov report.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221962 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Justin Bogner
2014-11-14 01:50:32 +00:00
parent 4a7bbf4c29
commit d24e90a5de
5 changed files with 66 additions and 43 deletions

View File

@ -28,44 +28,16 @@ unsigned CoverageSummary::getFileID(StringRef Filename) {
}
void
CoverageSummary::createSummaries(ArrayRef<coverage::FunctionRecord> Functions) {
std::vector<std::pair<unsigned, size_t>> FunctionFileIDs;
FunctionFileIDs.resize(Functions.size());
for (size_t I = 0, E = Functions.size(); I < E; ++I) {
StringRef Filename = Functions[I].Filenames[0];
FunctionFileIDs[I] = std::make_pair(getFileID(Filename), I);
}
// Sort the function records by file ids
std::sort(FunctionFileIDs.begin(), FunctionFileIDs.end(),
[](const std::pair<unsigned, size_t> &lhs,
const std::pair<unsigned, size_t> &rhs) {
return lhs.first < rhs.first;
});
// Create function summaries in a sorted order (by file ids)
FunctionSummaries.reserve(Functions.size());
for (size_t I = 0, E = Functions.size(); I < E; ++I)
FunctionSummaries.push_back(
FunctionCoverageSummary::get(Functions[FunctionFileIDs[I].second]));
// Create file summaries
size_t CurrentSummary = 0;
for (unsigned FileID = 0; FileID < Filenames.size(); ++FileID) {
// Gather the relevant functions summaries
auto PrevSummary = CurrentSummary;
while (CurrentSummary < FunctionSummaries.size() &&
FunctionFileIDs[CurrentSummary].first == FileID)
++CurrentSummary;
ArrayRef<FunctionCoverageSummary> LocalSummaries(
FunctionSummaries.data() + PrevSummary,
FunctionSummaries.data() + CurrentSummary);
if (LocalSummaries.empty())
CoverageSummary::createSummaries(const coverage::CoverageMapping &Coverage) {
for (StringRef Filename : Coverage.getUniqueSourceFiles()) {
size_t PrevSize = FunctionSummaries.size();
for (const auto &F : Coverage.getCoveredFunctions(Filename))
FunctionSummaries.push_back(FunctionCoverageSummary::get(F));
size_t Count = FunctionSummaries.size() - PrevSize;
if (Count == 0)
continue;
FileSummaries.push_back(
FileCoverageSummary::get(Filenames[FileID], LocalSummaries));
FileSummaries.push_back(FileCoverageSummary::get(
Filename, makeArrayRef(FunctionSummaries.data() + PrevSize, Count)));
}
}