From 43247f05421ba6e6f247592be6c2f39778796c6e Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Thu, 9 Nov 2017 02:33:43 +0000 Subject: [Coverage] Use the wrapped segment when a line has entry segments We've worked around bugs in the frontend by ignoring the count from wrapped segments when a line has at least one region entry segment. Those frontend bugs are now fixed, so it's time to regenerate the checked-in covmapping files and remove the workaround. llvm-svn: 317761 --- llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp') diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index e839184..7e9fc23 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -514,8 +514,9 @@ void SourceCoverageViewHTML::renderLine(raw_ostream &OS, LineRef L, return tag("span", Snippet, Color.getValue()); }; - auto CheckIfUncovered = [](const CoverageSegment *S) { - return S && S->HasCount && S->Count == 0; + auto CheckIfUncovered = [&](const CoverageSegment *S) { + return S && (!S->IsGapRegion || (Color && *Color == "red")) && + S->HasCount && S->Count == 0; }; if (CheckIfUncovered(LCS.getWrappedSegment())) { @@ -526,11 +527,10 @@ void SourceCoverageViewHTML::renderLine(raw_ostream &OS, LineRef L, for (unsigned I = 0, E = Segments.size(); I < E; ++I) { const auto *CurSeg = Segments[I]; - if (CurSeg->Col == ExpansionCol) - Color = "cyan"; - else if ((!CurSeg->IsGapRegion || (Color && *Color == "red")) && - CheckIfUncovered(CurSeg)) + if (CheckIfUncovered(CurSeg)) Color = "red"; + else if (CurSeg->Col == ExpansionCol) + Color = "cyan"; else Color = None; -- cgit v1.1