diff options
Diffstat (limited to 'llvm/tools')
-rw-r--r-- | llvm/tools/llvm-cov/SourceCoverageView.cpp | 4 | ||||
-rw-r--r-- | llvm/tools/llvm-cov/SourceCoverageView.h | 46 |
2 files changed, 25 insertions, 25 deletions
diff --git a/llvm/tools/llvm-cov/SourceCoverageView.cpp b/llvm/tools/llvm-cov/SourceCoverageView.cpp index 58c8a679..0d28006 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageView.cpp @@ -96,7 +96,7 @@ static std::string formatCount(uint64_t N) { void SourceCoverageView::renderLineCoverageColumn(raw_ostream &OS, - const LineCoverageInfo &Line) { + const LineCoverageStats &Line) { if (!Line.isMapped()) { OS.indent(LineCoverageColumnWidth) << '|'; return; @@ -186,7 +186,7 @@ void SourceCoverageView::render(raw_ostream &OS, bool WholeFile, LineSegments.push_back(&*NextSegment++); // Calculate a count to be for the line as a whole. - LineCoverageInfo LineCount; + LineCoverageStats LineCount; if (WrappedSegment && WrappedSegment->HasCount) LineCount.addRegionCount(WrappedSegment->Count); for (const auto *S : LineSegments) diff --git a/llvm/tools/llvm-cov/SourceCoverageView.h b/llvm/tools/llvm-cov/SourceCoverageView.h index 22c87254..49a5f4ac 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.h +++ b/llvm/tools/llvm-cov/SourceCoverageView.h @@ -73,34 +73,34 @@ struct InstantiationView { } }; -/// \brief A code coverage view of a specific source file. -/// It can have embedded coverage views. -class SourceCoverageView { -private: - /// \brief Coverage information for a single line. - struct LineCoverageInfo { - uint64_t ExecutionCount; - unsigned RegionCount; - bool Mapped; +/// \brief Coverage statistics for a single line. +struct LineCoverageStats { + uint64_t ExecutionCount; + unsigned RegionCount; + bool Mapped; - LineCoverageInfo() : ExecutionCount(0), RegionCount(0), Mapped(false) {} + LineCoverageStats() : ExecutionCount(0), RegionCount(0), Mapped(false) {} - bool isMapped() const { return Mapped; } + bool isMapped() const { return Mapped; } - bool hasMultipleRegions() const { return RegionCount > 1; } + bool hasMultipleRegions() const { return RegionCount > 1; } - void addRegionStartCount(uint64_t Count) { - // The max of all region starts is the most interesting value. - addRegionCount(RegionCount ? std::max(ExecutionCount, Count) : Count); - ++RegionCount; - } + void addRegionStartCount(uint64_t Count) { + // The max of all region starts is the most interesting value. + addRegionCount(RegionCount ? std::max(ExecutionCount, Count) : Count); + ++RegionCount; + } - void addRegionCount(uint64_t Count) { - Mapped = true; - ExecutionCount = Count; - } - }; + void addRegionCount(uint64_t Count) { + Mapped = true; + ExecutionCount = Count; + } +}; +/// \brief A code coverage view of a specific source file. +/// It can have embedded coverage views. +class SourceCoverageView { +private: const MemoryBuffer &File; const CoverageViewOptions &Options; coverage::CoverageData CoverageInfo; @@ -118,7 +118,7 @@ private: void renderViewDivider(unsigned Offset, unsigned Length, raw_ostream &OS); /// \brief Render the line's execution count column. - void renderLineCoverageColumn(raw_ostream &OS, const LineCoverageInfo &Line); + void renderLineCoverageColumn(raw_ostream &OS, const LineCoverageStats &Line); /// \brief Render the line number column. void renderLineNumberColumn(raw_ostream &OS, unsigned LineNo); |