summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2017-09-15 23:00:01 +0000
committerVedant Kumar <vsk@apple.com>2017-09-15 23:00:01 +0000
commitc445e65d0969dba334b4b1cb545457f98f5c654c (patch)
tree12f2343756f774c0d780d3fa08d9b5b6fb708461 /llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
parentb84e48447e4456bb29261b7380d9696bcf29f511 (diff)
downloadbcm5719-llvm-c445e65d0969dba334b4b1cb545457f98f5c654c.tar.gz
bcm5719-llvm-c445e65d0969dba334b4b1cb545457f98f5c654c.zip
[llvm-cov] Make some summary info fields private. NFC.
There's a bug in the way the line and region summary objects are merged. It would have been less likely to occur if those objects kept some data private. llvm-svn: 313416
Diffstat (limited to 'llvm/tools/llvm-cov/CoverageSummaryInfo.cpp')
-rw-r--r--llvm/tools/llvm-cov/CoverageSummaryInfo.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp b/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
index d025aa86119..ec263c8c987 100644
--- a/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
+++ b/llvm/tools/llvm-cov/CoverageSummaryInfo.cpp
@@ -87,10 +87,8 @@ FunctionCoverageSummary::get(const InstantiationGroup &Group,
Summary.RegionCoverage = Summaries[0].RegionCoverage;
Summary.LineCoverage = Summaries[0].LineCoverage;
for (const auto &FCS : Summaries.drop_front()) {
- Summary.RegionCoverage.Covered =
- std::max(FCS.RegionCoverage.Covered, Summary.RegionCoverage.Covered);
- Summary.LineCoverage.Covered =
- std::max(FCS.LineCoverage.Covered, Summary.LineCoverage.Covered);
+ Summary.RegionCoverage.merge(FCS.RegionCoverage);
+ Summary.LineCoverage.merge(FCS.LineCoverage);
}
return Summary;
}
OpenPOWER on IntegriCloud