From c445e65d0969dba334b4b1cb545457f98f5c654c Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Fri, 15 Sep 2017 23:00:01 +0000 Subject: [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 --- llvm/tools/llvm-cov/CoverageSummaryInfo.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/tools/llvm-cov/CoverageSummaryInfo.cpp') 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; } -- cgit v1.2.3