Updated with total error count, and always emitting a json file if requested

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 JsonSummaryFile = "";
+  std::string JsonSummaryFile;
   std::function<llvm::StringRef(uint64_t DwarfRegNum, bool IsEH)>
       GetNameForDWARFReg;
 

llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp

@@ -2028,9 +2028,7 @@ void OutputCategoryAggregator::EnumerateResults(
 }
 
 void DWARFVerifier::summarize() {
-  if (!ErrorCategory.GetNumCategories())
-    return;
-  if (DumpOpts.ShowAggregateErrors) {
+  if (DumpOpts.ShowAggregateErrors && ErrorCategory.GetNumCategories()) {
     error() << "Aggregated error counts:\n";
     ErrorCategory.EnumerateResults([&](StringRef s, unsigned count) {
       error() << s << " occurred " << count << " time(s).\n";
@@ -2047,13 +2045,16 @@ void DWARFVerifier::summarize() {
     }
 
     llvm::json::Object Categories;
-    ErrorCategory.EnumerateResults([&](StringRef category, unsigned count) {
+    uint64_t ErrorCount = 0;
+    ErrorCategory.EnumerateResults([&](StringRef Category, unsigned Count) {
       llvm::json::Object Val;
-      Val.try_emplace("count", count);
-      Categories.try_emplace(category, std::move(Val));
+      Val.try_emplace("count", Count);
+      Categories.try_emplace(Category, std::move(Val));
+      ErrorCount += Count;
     });
     llvm::json::Object RootNode;
     RootNode.try_emplace("error-categories", std::move(Categories));
+    RootNode.try_emplace("error-count", ErrorCount);
 
     JsonStream << llvm::json::Value(std::move(RootNode));
   }

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

@@ -297,8 +297,8 @@ static opt<ErrorDetailLevel> ErrorDetails(
     cat(DwarfDumpCategory));
 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::desc("Output JSON-formatted error summary to the specified file. "
+             "(Implies -verify)"),
     cl::value_desc("filename.json"), cat(DwarfDumpCategory));
 static opt<bool> Quiet("quiet", desc("Use with -verify to not emit to STDOUT."),
                        cat(DwarfDumpCategory));