[llvm-cov] Delete custom JSON serialization code (NFC)

Teach llvm-cov to use the new llvm JSON library, and remove some
redundant/brittle JSON serialization tests.

llvm-svn: 342088

11 files changed, 31 insertions, 263 deletions

diff --git a/llvm/test/tools/llvm-cov/Inputs/binary-formats.canonical.json b/llvm/test/tools/llvm-cov/Inputs/binary-formats.canonical.json
index 19147e2f29b..f8bfcede1fd 100644
--- a/llvm/test/tools/llvm-cov/Inputs/binary-formats.canonical.json
+++ b/llvm/test/tools/llvm-cov/Inputs/binary-formats.canonical.json
@@ -1,39 +1,27 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}binary-formats.c",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: [4,40,100,1,1],[4,42,0,0,0]],
-// CHECK-SAME: "expansions":[],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"main","count":100,"regions":[
-// CHECK-SAME: [4,40,4,42,100,0,0,0]
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}binary-formats.c"]
-// CHECK-SAME: }],
-
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "instantiations":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}}
-
-// Close the export object, data array, and root object
-// CHECK-SAME: }]}
+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:     "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"
diff --git a/llvm/test/tools/llvm-cov/Inputs/highlightedRanges.json b/llvm/test/tools/llvm-cov/Inputs/highlightedRanges.json
deleted file mode 100644
index cff6ab3e686..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/highlightedRanges.json
+++ /dev/null
@@ -1,51 +0,0 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}showHighlightedRanges.cpp",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "expansions":[],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":40,"covered":33,"percent":82},
-// CHECK-SAME: "functions":{"count":4,"covered":4,"percent":100},
-// CHECK-SAME: "regions":{"count":21,"covered":13,"notcovered":8,"percent":61}}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"_Z4funcv","count":1,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}showHighlightedRanges.cpp"]
-// CHECK-SAME: },
-// CHECK-SAME: {"name":"_Z5func2i","count":1,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}showHighlightedRanges.cpp"]
-// CHECK-SAME: }
-// CHECK-SAME: {"name":"_Z4testv","count":1,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}showHighlightedRanges.cpp"]
-// CHECK-SAME: }
-// CHECK-SAME: {"name":"main","count":1,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{.*}}showHighlightedRanges.cpp"]
-// CHECK-SAME: }],
-
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":40,"covered":33,"percent":82},
-// CHECK-SAME: "functions":{"count":4,"covered":4,"percent":100},
-// CHECK-SAME: "instantiations":{"count":4,"covered":4,"percent":100},
-// CHECK-SAME: "regions":{"count":21,"covered":13,"notcovered":8,"percent":61}}}
diff --git a/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.json b/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.json
deleted file mode 100644
index 07f39e7c8b5..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/lineExecutionCounts.json
+++ /dev/null
@@ -1,39 +0,0 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}showLineExecutionCounts.cpp",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "expansions":[],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":20,"covered":18,"percent":90},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":11,"covered":8,"notcovered":3,"percent":72}}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"main","count":161,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}showLineExecutionCounts.cpp"]
-// CHECK-SAME: }],
-
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":20,"covered":18,"percent":90},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "instantiations":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":11,"covered":8,"notcovered":3,"percent":72}}
-
-// Close the export object, data array, and root object
-// CHECK-SAME: }]}
diff --git a/llvm/test/tools/llvm-cov/Inputs/regionMarkers.json b/llvm/test/tools/llvm-cov/Inputs/regionMarkers.json
deleted file mode 100644
index c9964338947..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/regionMarkers.json
+++ /dev/null
@@ -1,35 +0,0 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}showRegionMarkers.cpp",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "expansions":[],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":21,"covered":19,"percent":90},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":11,"covered":8,"notcovered":3,"percent":72}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"main","count":1111000,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":["{{[^"]+}}showRegionMarkers.cpp"]
-// CHECK-SAME: }],
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":21,"covered":19,"percent":90},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "instantiations":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":11,"covered":8,"notcovered":3,"percent":72}}
diff --git a/llvm/test/tools/llvm-cov/Inputs/showExpansions.json b/llvm/test/tools/llvm-cov/Inputs/showExpansions.json
index d145f7d8b49..9c1fc73c0af 100644
--- a/llvm/test/tools/llvm-cov/Inputs/showExpansions.json
+++ b/llvm/test/tools/llvm-cov/Inputs/showExpansions.json
@@ -1,52 +1,4 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}showExpansions.cpp",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "expansions":[
-// CHECK-SAME: {"source_region":[24,5,24,17,100,0,1,1],
-// CHECK-SAME: "target_regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-
-// Yes, 4 of the same filename in a row
-// CHECK-SAME: "filenames":[
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp","{{[^"]+}}showExpansions.cpp",
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp","{{[^"]+}}showExpansions.cpp"]
-// CHECK-SAME: }],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":5,"covered":5,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":13,"covered":12,"notcovered":1,"percent":92}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"main","count":1,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}
-// CHECK-SAME: ],
-// CHECK-SAME: "filenames":[
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp",
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp",
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp",
-// CHECK-SAME: "{{[^"]+}}showExpansions.cpp"]
-// CHECK-SAME: }],
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":5,"covered":5,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "instantiations":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":13,"covered":12,"notcovered":1,"percent":92}}
-
-// Close the export object, data array, and root object
-// CHECK-SAME: }]}
+CHECK: {"expansions":
+CHECK:    "filenames":["{{[^"]+}}showExpansions.cpp",
+CHECK:    "source_region":[24,5,24,17,100,0,1,1],
+CHECK:    "filename":"{{[^"]+}}showExpansions.cpp",
diff --git a/llvm/test/tools/llvm-cov/Inputs/universal-binary.json b/llvm/test/tools/llvm-cov/Inputs/universal-binary.json
deleted file mode 100644
index 54b9e228b4f..00000000000
--- a/llvm/test/tools/llvm-cov/Inputs/universal-binary.json
+++ /dev/null
@@ -1,37 +0,0 @@
-// Metadata section
-// CHECK: {"version":"{{[0-9]\.[0-9]\.[0-9]}}","type":"llvm.coverage.json.export","data":[
-
-// Open Export
-// CHECK-SAME: {"files":[
-
-// File Object
-// CHECK-SAME: {"filename":"{{[^"]+}}universal-binary.c",
-// CHECK-SAME: "segments":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "expansions":[],
-
-// Verify the Summary Section for the first file
-// CHECK-SAME: "summary":{
-// CHECK-SAME: "lines":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}}
-
-// Close Files Array
-// CHECK-SAME: ],
-
-// Functions List
-// CHECK-SAME: "functions":[
-// CHECK-SAME: {"name":"main","count":100,"regions":[
-// CHECK-SAME: {{(\[[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+,[0-9]+\],?)+}}],
-// CHECK-SAME: "filenames":["{{[^"]+}}universal-binary.c"]
-// CHECK-SAME: }],
-
-// Full Export Summary
-// CHECK-SAME: "totals":{
-// CHECK-SAME: "lines":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "functions":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "instantiations":{"count":1,"covered":1,"percent":100},
-// CHECK-SAME: "regions":{"count":1,"covered":1,"notcovered":0,"percent":100}
-
-// Close the export object, data array, and root object
-// CHECK-SAME: }]}
diff --git a/llvm/test/tools/llvm-cov/binary-formats.c b/llvm/test/tools/llvm-cov/binary-formats.c
index 3c2fa26afa3..8836971d423 100644
--- a/llvm/test/tools/llvm-cov/binary-formats.c
+++ b/llvm/test/tools/llvm-cov/binary-formats.c
@@ -8,6 +8,4 @@ int main(int argc, const char *argv[]) {}
 // RUN: llvm-cov show %S/Inputs/binary-formats.macho64l -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck %s
 // RUN: llvm-cov show %S/Inputs/binary-formats.macho32b -instr-profile %t.profdata -path-equivalence=/tmp,%S %s | FileCheck %s
 
-// RUN: llvm-cov export %S/Inputs/binary-formats.macho32l -instr-profile %t.profdata | FileCheck %S/Inputs/binary-formats.canonical.json
 // RUN: llvm-cov export %S/Inputs/binary-formats.macho64l -instr-profile %t.profdata | FileCheck %S/Inputs/binary-formats.canonical.json
-// RUN: llvm-cov export %S/Inputs/binary-formats.macho32b -instr-profile %t.profdata | FileCheck %S/Inputs/binary-formats.canonical.json
diff --git a/llvm/test/tools/llvm-cov/showHighlightedRanges.cpp b/llvm/test/tools/llvm-cov/showHighlightedRanges.cpp
index f225816b0f6..a412c5375cb 100644
--- a/llvm/test/tools/llvm-cov/showHighlightedRanges.cpp
+++ b/llvm/test/tools/llvm-cov/showHighlightedRanges.cpp
@@ -45,4 +45,3 @@ int main() {
 }
 
 // RUN: llvm-cov show %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata -format html -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s -check-prefixes=HTML,SHARED
-// RUN: llvm-cov export %S/Inputs/highlightedRanges.covmapping -instr-profile %S/Inputs/highlightedRanges.profdata 2>&1 | FileCheck %S/Inputs/highlightedRanges.json
diff --git a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
index 7fc36a7a911..51ac3ae1dee 100644
--- a/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
+++ b/llvm/test/tools/llvm-cov/showLineExecutionCounts.cpp
@@ -35,10 +35,6 @@ int main() {                              // TEXT: [[@LINE]]|   161|int main(
 // RUN: FileCheck -check-prefixes=TEXT,WHOLE-FILE -input-file %t.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
 // RUN: FileCheck -check-prefixes=TEXT,FILTER -input-file %t.filtered.dir/coverage/tmp/showLineExecutionCounts.cpp.txt %s
 //
-// RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata -name=main 2>/dev/null > %t.export.json
-// RUN: FileCheck -input-file %t.export.json %S/Inputs/lineExecutionCounts.json
-// RUN: cat %t.export.json | %python -c "import json, sys; json.loads(sys.stdin.read())"
-//
 // RUN: llvm-cov export %S/Inputs/lineExecutionCounts.covmapping -instr-profile %t.profdata 2>/dev/null -summary-only > %t.export-summary.json
 // RUN: not grep '"name":"main"' %t.export-summary.json
 //
diff --git a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
index 676d6278576..84f80265b23 100644
--- a/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
+++ b/llvm/test/tools/llvm-cov/showRegionMarkers.cpp
@@ -24,5 +24,3 @@ int main() {                      // CHECK-NOT: Marker at [[@LINE]]:12
 
 // RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %t.profdata -show-regions -dump -path-equivalence=/tmp,%S/ %s 2>&1 | FileCheck %s
 // RUN: llvm-cov show %S/Inputs/regionMarkers.covmapping -instr-profile %t.profdata -show-regions -format=html -dump -path-equivalence=/tmp,%S %s 2>&1 | FileCheck %s
-
-// RUN: llvm-cov export %S/Inputs/regionMarkers.covmapping -instr-profile %t.profdata 2>&1 | FileCheck %S/Inputs/regionMarkers.json
diff --git a/llvm/test/tools/llvm-cov/universal-binary.c b/llvm/test/tools/llvm-cov/universal-binary.c
index 39fc22b7ce7..635cd32146e 100644
--- a/llvm/test/tools/llvm-cov/universal-binary.c
+++ b/llvm/test/tools/llvm-cov/universal-binary.c
@@ -5,7 +5,6 @@ int main(int argc, const char *argv[]) {}
 
 // RUN: llvm-profdata merge %S/Inputs/universal-binary.proftext -o %t.profdata
 // RUN: llvm-cov show %S/Inputs/universal-binary -instr-profile %t.profdata -path-equivalence=/tmp,%S %s -arch x86_64 | FileCheck %s
-// RUN: llvm-cov export %S/Inputs/universal-binary -instr-profile %t.profdata -arch x86_64 2>&1 | FileCheck %S/Inputs/universal-binary.json
 
 // RUN: llvm-cov report %S/Inputs/universal-binary -arch x86_64 -object %S/Inputs/templateInstantiations.covmapping -arch i386 -instr-profile %t.profdata 2>&1 | FileCheck %s --check-prefix=COMBINED
 // COMBINED: showTemplateInstantiations.cpp