[llvm] Modify dwarf verification JSON to include detailed counts by sub-category (PR #128018)

[Miro Bucko via llvm-commits]

================
@@ -2168,15 +2170,35 @@ bool DWARFVerifier::verifyDebugStrOffsets(
 
 void OutputCategoryAggregator::Report(
     StringRef s, std::function<void(void)> detailCallback) {
-  Aggregation[std::string(s)]++;
+  this->Report(s, "", detailCallback);
+}
+
+void OutputCategoryAggregator::Report(
+    StringRef category, StringRef sub_category,
+    std::function<void(void)> detailCallback) {
+  std::string category_str = std::string(category);
+  AggregationData *Agg = &Aggregation[category_str];
+  Agg->OverallCount++;
+  if (!sub_category.empty()) {
+    Agg->DetailedCounts[std::string(sub_category)]++;
+  }
   if (IncludeDetail)
     detailCallback();
 }
 
 void OutputCategoryAggregator::EnumerateResults(
     std::function<void(StringRef, unsigned)> handleCounts) {
-  for (auto &&[name, count] : Aggregation) {
-    handleCounts(name, count);
+  for (auto &&[name, aggData] : Aggregation) {
+    handleCounts(name, aggData.OverallCount);
+  }
+}
+void OutputCategoryAggregator::EnumerateDetailedResultsFor(
+    StringRef category, std::function<void(StringRef, unsigned)> handleCounts) {
+  auto Agg = Aggregation.find(std::string(category));
+  if (Agg != Aggregation.end()) {
+    for (auto &&[name, count] : Agg->second.DetailedCounts) {
----------------
mbucko wrote:

ditto

https://github.com/llvm/llvm-project/pull/128018