Export Segment.IsGapRegion to JSON

[def]

Summary

So that external tools can make use of that information and not display such lines as uncovered.

Fixes https://bugs.llvm.org/show_bug.cgi?id=45300

[def]

Fixed clang-format

[vsk]

Thanks for doing this. Yes, I think a patch version bump would be appropriate. Also, please update test/tools/llvm-cov/Inputs/binary-formats.canonical.json to test this change.

[def]

Increased the json export version to 2.0.1, fixed binary-formats.canonical.json

[vsk]

Lgtm, thanks.

llvm/test/tools/llvm-cov/Inputs/binary-formats.canonical.json

 CHECK: {"data":
 CHECK-SAME: [{
 CHECK-SAME:  "files":[
 CHECK-SAME:    {"expansions":[],
 CHECK-SAME:     "filename":"/tmp/binary-formats.c",
 CHECK-SAME:     "segments":
-CHECK-SAME:        4,40,100,true,true
-CHECK-SAME:        4,42,0,false,false
+CHECK-SAME:        4,40,100,true,true,false
+CHECK-SAME:        4,42,0,false,false,false
 CHECK-SAME:     "summary":{"functions":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:                "instantiations":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:                "lines":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:                "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}}}
 CHECK-SAME:  ],
 CHECK-SAME:  "functions":[
 CHECK-SAME:    {"count":100,"filenames":["/tmp/binary-formats.c"],"name":"main",
 CHECK-SAME:     "regions":
 CHECK-SAME:        4,40,4,42,100,0,0,0
 CHECK-SAME:    }
 CHECK-SAME:  ],
 CHECK-SAME:  "totals":
 CHECK-SAME:    {"functions":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:     "instantiations":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:     "lines":{"count":1,"covered":1,"percent":100},
 CHECK-SAME:     "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}}}
 CHECK-SAME: ],
 CHECK-SAME: "type":"llvm.coverage.json.export"
-CHECK-SAME: "version":"2.0.0"
+CHECK-SAME: "version":"2.0.1"

llvm/tools/llvm-cov/CoverageExporterJson.cpp

 #include "llvm/Support/ThreadPool.h"
 #include "llvm/Support/Threading.h"
 #include <algorithm>
 #include <limits>
 #include <mutex>
 #include <utility>
 
 /// The semantic version combined as a string.
-#define LLVM_COVERAGE_EXPORT_JSON_STR "2.0.0"
+#define LLVM_COVERAGE_EXPORT_JSON_STR "2.0.1"
 
 /// Unique type identifier for JSON coverage export.
 #define LLVM_COVERAGE_EXPORT_JSON_TYPE_STR "llvm.coverage.json.export"
 
 using namespace llvm;
 
 namespace {
 
 // The JSON library accepts int64_t, but profiling counts are stored as uint64_t.
 // Therefore we need to explicitly convert from unsigned to signed, since a naive
 // cast is implementation-defined behavior when the unsigned value cannot be
 // represented as a signed value. We choose to clamp the values to preserve the
 // invariant that counts are always >= 0.
 int64_t clamp_uint64_to_int64(uint64_t u) {
   return std::min(u, static_cast<uint64_t>(std::numeric_limits<int64_t>::max()));
 }
 
 json::Array renderSegment(const coverage::CoverageSegment &Segment) {
-  return json::Array({Segment.Line, Segment.Col, clamp_uint64_to_int64(Segment.Count),
-                      Segment.HasCount, Segment.IsRegionEntry});
+  return json::Array({Segment.Line, Segment.Col,
+                      clamp_uint64_to_int64(Segment.Count), Segment.HasCount,
+                      Segment.IsRegionEntry, Segment.IsGapRegion});
 }
 
 json::Array renderRegion(const coverage::CountedRegion &Region) {
   return json::Array({Region.LineStart, Region.ColumnStart, Region.LineEnd,
                       Region.ColumnEnd, clamp_uint64_to_int64(Region.ExecutionCount),
                       Region.FileID, Region.ExpandedFileID,
                       int64_t(Region.Kind)});
 }