[llvm-cov] Remove a redundant field. NFC.

The "NotCovered" fields in the region and line summary structs are
redundant. We should remove them to make the code clearer.

As a follow-up, the "NotCovered" entries should be removed from the
reports as well.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313415 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-cov/CoverageExporterJson.cpp b/tools/llvm-cov/CoverageExporterJson.cpp
index f891326ddfcabaecb4936fb7c3ca4b779e81ec1d..6ec6974f4c19cf06175feb8382002ebf77d4ec55 100644 (file)
--- a/tools/llvm-cov/CoverageExporterJson.cpp
+++ b/tools/llvm-cov/CoverageExporterJson.cpp
@@ -395,7 +395,9 @@ class CoverageExporterJson {
     emitDictStart();
     emitDictElement("count", Summary.RegionCoverage.NumRegions);
     emitDictElement("covered", Summary.RegionCoverage.Covered);
-    emitDictElement("notcovered", Summary.RegionCoverage.NotCovered);
+    emitDictElement("notcovered",
+                    Summary.RegionCoverage.NumRegions -
+                        Summary.RegionCoverage.Covered);
     emitDictElement("percent", Summary.RegionCoverage.getPercentCovered());
     // End Region Coverage Summary.
     emitDictEnd();

diff --git a/tools/llvm-cov/CoverageReport.cpp b/tools/llvm-cov/CoverageReport.cpp
index e21d74b8fab1ef46c6b6a25c11827337ddf9cab6..a6345fd9cc69881935cc4708899b447a0334d079 100644 (file)
--- a/tools/llvm-cov/CoverageReport.cpp
+++ b/tools/llvm-cov/CoverageReport.cpp
@@ -187,7 +187,8 @@ void CoverageReport::render(const FileCoverageSummary &File,
     OS << format("%*u", FileReportColumns[1],
                  (unsigned)File.RegionCoverage.NumRegions);
     Options.colored_ostream(OS, FileCoverageColor) << format(
-        "%*u", FileReportColumns[2], (unsigned)File.RegionCoverage.NotCovered);
+        "%*u", FileReportColumns[2], (unsigned)(File.RegionCoverage.NumRegions -
+                                                File.RegionCoverage.Covered));
     if (File.RegionCoverage.NumRegions)
       Options.colored_ostream(OS, FileCoverageColor)
           << format("%*.2f", FileReportColumns[3] - 1,
@@ -228,7 +229,8 @@ void CoverageReport::render(const FileCoverageSummary &File,
   OS << format("%*u", FileReportColumns[10],
                (unsigned)File.LineCoverage.NumLines);
   Options.colored_ostream(OS, LineCoverageColor) << format(
-      "%*u", FileReportColumns[11], (unsigned)File.LineCoverage.NotCovered);
+      "%*u", FileReportColumns[11],
+      (unsigned)(File.LineCoverage.NumLines - File.LineCoverage.Covered));
   if (File.LineCoverage.NumLines)
     Options.colored_ostream(OS, LineCoverageColor)
         << format("%*.2f", FileReportColumns[12] - 1,
@@ -252,7 +254,8 @@ void CoverageReport::render(const FunctionCoverageSummary &Function,
                (unsigned)Function.RegionCoverage.NumRegions);
   Options.colored_ostream(OS, FuncCoverageColor)
       << format("%*u", FunctionReportColumns[2],
-                (unsigned)Function.RegionCoverage.NotCovered);
+                (unsigned)(Function.RegionCoverage.NumRegions -
+                           Function.RegionCoverage.Covered));
   Options.colored_ostream(
       OS, determineCoveragePercentageColor(Function.RegionCoverage))
       << format("%*.2f", FunctionReportColumns[3] - 1,
@@ -262,7 +265,8 @@ void CoverageReport::render(const FunctionCoverageSummary &Function,
                (unsigned)Function.LineCoverage.NumLines);
   Options.colored_ostream(OS, LineCoverageColor)
       << format("%*u", FunctionReportColumns[5],
-                (unsigned)Function.LineCoverage.NotCovered);
+                (unsigned)(Function.LineCoverage.NumLines -
+                           Function.LineCoverage.Covered));
   Options.colored_ostream(
       OS, determineCoveragePercentageColor(Function.LineCoverage))
       << format("%*.2f", FunctionReportColumns[6] - 1,

diff --git a/tools/llvm-cov/CoverageSummaryInfo.cpp b/tools/llvm-cov/CoverageSummaryInfo.cpp
index 350c7a670046739dbc154e04807ba10aad7c2869..d025aa86119cfe4c921fb641d7970560c2196613 100644 (file)
--- a/tools/llvm-cov/CoverageSummaryInfo.cpp
+++ b/tools/llvm-cov/CoverageSummaryInfo.cpp
@@ -89,12 +89,8 @@ FunctionCoverageSummary::get(const InstantiationGroup &Group,
   for (const auto &FCS : Summaries.drop_front()) {
     Summary.RegionCoverage.Covered =
         std::max(FCS.RegionCoverage.Covered, Summary.RegionCoverage.Covered);
-    Summary.RegionCoverage.NotCovered = std::min(
-        FCS.RegionCoverage.NotCovered, Summary.RegionCoverage.NotCovered);
     Summary.LineCoverage.Covered =
         std::max(FCS.LineCoverage.Covered, Summary.LineCoverage.Covered);
-    Summary.LineCoverage.NotCovered =
-        std::min(FCS.LineCoverage.NotCovered, Summary.LineCoverage.NotCovered);
   }
   return Summary;
 }

diff --git a/tools/llvm-cov/CoverageSummaryInfo.h b/tools/llvm-cov/CoverageSummaryInfo.h
index e9e3f47108d8cc348f638661b96eb33b8bdaca81..91b9f62d3d9bbb40af1092b058915d171941bf6e 100644 (file)
--- a/tools/llvm-cov/CoverageSummaryInfo.h
+++ b/tools/llvm-cov/CoverageSummaryInfo.h
@@ -25,21 +25,16 @@ struct RegionCoverageInfo {
   /// \brief The number of regions that were executed at least once.
   size_t Covered;
 
-  /// \brief The number of regions that weren't executed.
-  size_t NotCovered;
-
   /// \brief The total number of regions in a function/file.
   size_t NumRegions;
 
-  RegionCoverageInfo() : Covered(0), NotCovered(0), NumRegions(0) {}
+  RegionCoverageInfo() : Covered(0), NumRegions(0) {}
 
   RegionCoverageInfo(size_t Covered, size_t NumRegions)
-      : Covered(Covered), NotCovered(NumRegions - Covered),
-        NumRegions(NumRegions) {}
+      : Covered(Covered), NumRegions(NumRegions) {}
 
   RegionCoverageInfo &operator+=(const RegionCoverageInfo &RHS) {
     Covered += RHS.Covered;
-    NotCovered += RHS.NotCovered;
     NumRegions += RHS.NumRegions;
     return *this;
   }
@@ -58,20 +53,16 @@ struct LineCoverageInfo {
   /// \brief The number of lines that were executed at least once.
   size_t Covered;
 
-  /// \brief The number of lines that weren't executed.
-  size_t NotCovered;
-
   /// \brief The total number of lines in a function/file.
   size_t NumLines;
 
-  LineCoverageInfo() : Covered(0), NotCovered(0), NumLines(0) {}
+  LineCoverageInfo() : Covered(0), NumLines(0) {}
 
   LineCoverageInfo(size_t Covered, size_t NumLines)
-      : Covered(Covered), NotCovered(NumLines - Covered), NumLines(NumLines) {}
+      : Covered(Covered), NumLines(NumLines) {}
 
   LineCoverageInfo &operator+=(const LineCoverageInfo &RHS) {
     Covered += RHS.Covered;
-    NotCovered += RHS.NotCovered;
     NumLines += RHS.NumLines;
     return *this;
   }