From e955f6183749410992ef358b2d49b8cae2acaae1 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 18 Oct 2017 23:58:27 +0000 Subject: [PATCH] [llvm-cov] Use the coverage namespace. NFC. This is a simple code cleanup. It will facilitate moving LineCoverageIterator to libCoverage. llvm-svn: 316140 --- llvm/tools/llvm-cov/SourceCoverageView.cpp | 11 +++++------ llvm/tools/llvm-cov/SourceCoverageView.h | 19 ++++++++++--------- .../tools/llvm-cov/SourceCoverageViewHTML.cpp | 5 ++--- llvm/tools/llvm-cov/SourceCoverageViewHTML.h | 2 ++ .../tools/llvm-cov/SourceCoverageViewText.cpp | 3 +-- llvm/tools/llvm-cov/SourceCoverageViewText.h | 6 ++++-- 6 files changed, 24 insertions(+), 22 deletions(-) diff --git a/llvm/tools/llvm-cov/SourceCoverageView.cpp b/llvm/tools/llvm-cov/SourceCoverageView.cpp index 6cb4a2c026b3..f2e8788fec84 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageView.cpp @@ -84,10 +84,9 @@ CoveragePrinter::create(const CoverageViewOptions &Opts) { } unsigned SourceCoverageView::getFirstUncoveredLineNo() { - const auto MinSegIt = - find_if(CoverageInfo, [](const coverage::CoverageSegment &S) { - return S.HasCount && S.Count == 0; - }); + const auto MinSegIt = find_if(CoverageInfo, [](const CoverageSegment &S) { + return S.HasCount && S.Count == 0; + }); // There is no uncovered line, return zero. if (MinSegIt == CoverageInfo.end()) @@ -132,7 +131,7 @@ bool SourceCoverageView::hasSubViews() const { std::unique_ptr SourceCoverageView::create(StringRef SourceName, const MemoryBuffer &File, const CoverageViewOptions &Options, - coverage::CoverageData &&CoverageInfo) { + CoverageData &&CoverageInfo) { switch (Options.Format) { case CoverageViewOptions::OutputFormat::Text: return llvm::make_unique( @@ -152,7 +151,7 @@ std::string SourceCoverageView::getSourceName() const { } void SourceCoverageView::addExpansion( - const coverage::CounterMappingRegion &Region, + const CounterMappingRegion &Region, std::unique_ptr View) { ExpansionSubViews.emplace_back(Region, std::move(View)); } diff --git a/llvm/tools/llvm-cov/SourceCoverageView.h b/llvm/tools/llvm-cov/SourceCoverageView.h index 501c17d35bad..35dea591bf04 100644 --- a/llvm/tools/llvm-cov/SourceCoverageView.h +++ b/llvm/tools/llvm-cov/SourceCoverageView.h @@ -22,15 +22,17 @@ namespace llvm { +using namespace coverage; + class CoverageFiltersMatchAll; class SourceCoverageView; /// \brief A view that represents a macro or include expansion. struct ExpansionView { - coverage::CounterMappingRegion Region; + CounterMappingRegion Region; std::unique_ptr View; - ExpansionView(const coverage::CounterMappingRegion &Region, + ExpansionView(const CounterMappingRegion &Region, std::unique_ptr View) : Region(Region), View(std::move(View)) {} ExpansionView(ExpansionView &&RHS) @@ -112,7 +114,7 @@ public: /// \brief Create an index which lists reports for the given source files. virtual Error createIndexFile(ArrayRef SourceFiles, - const coverage::CoverageMapping &Coverage, + const CoverageMapping &Coverage, const CoverageFiltersMatchAll &Filters) = 0; /// @} @@ -134,7 +136,7 @@ class SourceCoverageView { const CoverageViewOptions &Options; /// Complete coverage information about the source on display. - coverage::CoverageData CoverageInfo; + CoverageData CoverageInfo; /// A container for all expansions (e.g macros) in the source on display. std::vector ExpansionSubViews; @@ -154,7 +156,7 @@ protected: LineRef(StringRef Line, int64_t LineNo) : Line(Line), LineNo(LineNo) {} }; - using CoverageSegmentArray = ArrayRef; + using CoverageSegmentArray = ArrayRef; /// @name Rendering Interface /// @{ @@ -230,15 +232,14 @@ protected: SourceCoverageView(StringRef SourceName, const MemoryBuffer &File, const CoverageViewOptions &Options, - coverage::CoverageData &&CoverageInfo) + CoverageData &&CoverageInfo) : SourceName(SourceName), File(File), Options(Options), CoverageInfo(std::move(CoverageInfo)) {} public: static std::unique_ptr create(StringRef SourceName, const MemoryBuffer &File, - const CoverageViewOptions &Options, - coverage::CoverageData &&CoverageInfo); + const CoverageViewOptions &Options, CoverageData &&CoverageInfo); virtual ~SourceCoverageView() {} @@ -248,7 +249,7 @@ public: const CoverageViewOptions &getOptions() const { return Options; } /// \brief Add an expansion subview to this view. - void addExpansion(const coverage::CounterMappingRegion &Region, + void addExpansion(const CounterMappingRegion &Region, std::unique_ptr View); /// \brief Add a function instantiation subview to this view. diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index 4900ad4bf5e5..e83918474cba 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -365,8 +365,7 @@ void CoveragePrinterHTML::emitFileSummary(raw_ostream &OS, StringRef SF, } Error CoveragePrinterHTML::createIndexFile( - ArrayRef SourceFiles, - const coverage::CoverageMapping &Coverage, + ArrayRef SourceFiles, const CoverageMapping &Coverage, const CoverageFiltersMatchAll &Filters) { // Emit the default stylesheet. auto CSSOrErr = createOutputStream("style", "css", /*InToplevel=*/true); @@ -515,7 +514,7 @@ void SourceCoverageViewHTML::renderLine(raw_ostream &OS, LineRef L, return tag("span", Snippet, Color.getValue()); }; - auto CheckIfUncovered = [](const coverage::CoverageSegment *S) { + auto CheckIfUncovered = [](const CoverageSegment *S) { return S && S->HasCount && S->Count == 0; }; diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.h b/llvm/tools/llvm-cov/SourceCoverageViewHTML.h index 4026aad3f73d..91b4ad4e220c 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.h +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.h @@ -18,6 +18,8 @@ namespace llvm { +using namespace coverage; + struct FileCoverageSummary; /// \brief A coverage printer for html output. diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp index 2ed16dfbc692..4b69b08e5a53 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewText.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewText.cpp @@ -29,8 +29,7 @@ void CoveragePrinterText::closeViewFile(OwnedStream OS) { } Error CoveragePrinterText::createIndexFile( - ArrayRef SourceFiles, - const coverage::CoverageMapping &Coverage, + ArrayRef SourceFiles, const CoverageMapping &Coverage, const CoverageFiltersMatchAll &Filters) { auto OSOrErr = createOutputStream("index", "txt", /*InToplevel=*/true); if (Error E = OSOrErr.takeError()) diff --git a/llvm/tools/llvm-cov/SourceCoverageViewText.h b/llvm/tools/llvm-cov/SourceCoverageViewText.h index cf96aaf5d8d8..cabf91975df3 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewText.h +++ b/llvm/tools/llvm-cov/SourceCoverageViewText.h @@ -18,6 +18,8 @@ namespace llvm { +using namespace coverage; + /// \brief A coverage printer for text output. class CoveragePrinterText : public CoveragePrinter { public: @@ -27,7 +29,7 @@ public: void closeViewFile(OwnedStream OS) override; Error createIndexFile(ArrayRef SourceFiles, - const coverage::CoverageMapping &Coverage, + const CoverageMapping &Coverage, const CoverageFiltersMatchAll &Filters) override; CoveragePrinterText(const CoverageViewOptions &Opts) @@ -77,7 +79,7 @@ class SourceCoverageViewText : public SourceCoverageView { public: SourceCoverageViewText(StringRef SourceName, const MemoryBuffer &File, const CoverageViewOptions &Options, - coverage::CoverageData &&CoverageInfo) + CoverageData &&CoverageInfo) : SourceCoverageView(SourceName, File, Options, std::move(CoverageInfo)) { } }; -- 2.34.1