Updated to use explicit JSON objects, renamed flag to --json-summary-file

Author: Kevin Frei

llvm/include/llvm/DebugInfo/DIContext.h

@@ -206,7 +206,7 @@ struct DIDumpOptions {
   bool IsEH = false;
   bool DumpNonSkeleton = false;
   bool ShowAggregateErrors = false;
-  std::string AggregateErrJsonFile = "";
+  std::string JsonSummaryFile = "";
   std::function<llvm::StringRef(uint64_t DwarfRegNum, bool IsEH)>
       GetNameForDWARFReg;
 

llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp

@@ -32,6 +32,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FormatVariadic.h"
+#include "llvm/Support/JSON.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
 #include <map>
@@ -2036,27 +2037,26 @@ void DWARFVerifier::summarize() {
       error() << s << " occurred " << count << " time(s).\n";
     });
   }
-  if (!DumpOpts.AggregateErrJsonFile.empty()) {
+  if (!DumpOpts.JsonSummaryFile.empty()) {
     std::error_code EC;
-    raw_fd_ostream JsonStream(DumpOpts.AggregateErrJsonFile, EC,
-                              sys::fs::OF_Text);
+    raw_fd_ostream JsonStream(DumpOpts.JsonSummaryFile, EC, sys::fs::OF_Text);
     if (EC) {
       error() << "error opening aggregate error json file '"
-              << DumpOpts.AggregateErrJsonFile
-              << "' for writing: " << EC.message() << '\n';
+              << DumpOpts.JsonSummaryFile << "' for writing: " << EC.message()
+              << '\n';
       return;
     }
-    JsonStream << "{\"errors\":[\n";
-    bool prev = false;
+
+    llvm::json::Object Categories;
     ErrorCategory.EnumerateResults([&](StringRef category, unsigned count) {
-      if (prev)
-        JsonStream << ",\n";
-      JsonStream << "{\"category\":\"";
-      llvm::printEscapedString(category, JsonStream);
-      JsonStream << "\",\"count\":" << count << "}";
-      prev = true;
+      llvm::json::Object Val;
+      Val.try_emplace("count", count);
+      Categories.try_emplace(category, std::move(Val));
     });
-    JsonStream << "\n]}\n";
+    llvm::json::Object RootNode;
+    RootNode.try_emplace("error-categories", std::move(Categories));
+
+    JsonStream << llvm::json::Value(std::move(RootNode));
   }
 }
 

llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

@@ -295,8 +295,8 @@ static opt<ErrorDetailLevel> ErrorDetails(
            clEnumValN(BothDetailsAndSummary, "full",
                       "Display each error as well as a summary. [default]")),
     cat(DwarfDumpCategory));
-static opt<std::string> AggregationJsonFile(
-    "aggregate-output-file", cl::init(""),
+static opt<std::string> JsonSummaryFile(
+    "json-summary-file", cl::init(""),
     cl::desc("When using --verify, output JSON-formatted error summary to the "
              "specified file."),
     cl::value_desc("filename.json"), cat(DwarfDumpCategory));
@@ -354,7 +354,7 @@ static DIDumpOptions getDumpOpts(DWARFContext &C) {
                        ErrorDetails != NoDetailsOrSummary;
     DumpOpts.ShowAggregateErrors = ErrorDetails != OnlyDetailsNoSummary &&
                                    ErrorDetails != NoDetailsOnlySummary;
-    DumpOpts.AggregateErrJsonFile = AggregationJsonFile;
+    DumpOpts.JsonSummaryFile = JsonSummaryFile;
     return DumpOpts.noImplicitRecursion();
   }
   return DumpOpts;
@@ -842,9 +842,8 @@ int main(int argc, char **argv) {
   }
   if (!Verify && ErrorDetails != Unspecified)
     WithColor::warning() << "-error-detail has no affect without -verify";
-  if (!Verify && !AggregationJsonFile.empty())
-    WithColor::warning()
-        << "-aggregate-output-file has no affect without -verify";
+  if (!Verify && !JsonSummaryFile.empty())
+    WithColor::warning() << "-json-summary-file has no affect without -verify";
 
   std::error_code EC;
   ToolOutputFile OutputFile(OutputFilename, EC, sys::fs::OF_TextWithCRLF);