mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-18 18:42:46 +02:00
[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. llvm-svn: 313415
This commit is contained in:
parent
fb4efe8f9b
commit
9a91c24748
@ -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();
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user