Revert "Modify dwarfdump verification to allow sub-category counts (#125062)"

This reverts commit 13f6301.
Breaks check-llvm.

Author: nico

llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h

@@ -30,29 +30,18 @@ class DWARFDebugAbbrev;
 class DataExtractor;
 struct DWARFSection;
 
-struct AggregationData {
-  unsigned OverallCount;
-  std::map<std::string, unsigned> DetailedCounts;
-  AggregationData() = default;
-};
-
 class OutputCategoryAggregator {
 private:
-  std::map<std::string, AggregationData> Aggregation;
+  std::map<std::string, unsigned> Aggregation;
   bool IncludeDetail;
 
 public:
   OutputCategoryAggregator(bool includeDetail = false)
       : IncludeDetail(includeDetail) {}
   void ShowDetail(bool showDetail) { IncludeDetail = showDetail; }
   size_t GetNumCategories() const { return Aggregation.size(); }
-  void Report(StringRef category, std::function<void()> detailCallback);
-  void Report(StringRef category, StringRef sub_category,
-              std::function<void()> detailCallback);
+  void Report(StringRef s, std::function<void()> detailCallback);
   void EnumerateResults(std::function<void(StringRef, unsigned)> handleCounts);
-  void EnumerateDetailedResultsFor(
-      StringRef category,
-      std::function<void(StringRef, unsigned)> handleCounts);
 };
 
 /// A class that verifies DWARF debug information given a DWARF Context.

llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp

@@ -1941,14 +1941,12 @@ unsigned DWARFVerifier::verifyNameIndexCompleteness(
     if (none_of(NI.equal_range(Name), [&](const DWARFDebugNames::Entry &E) {
           return E.getDIEUnitOffset() == DieUnitOffset;
         })) {
-      ErrorCategory.Report(
-          "Name Index DIE entry missing name",
-          llvm::dwarf::TagString(Die.getTag()), [&]() {
-            error() << formatv(
-                "Name Index @ {0:x}: Entry for DIE @ {1:x} ({2}) with "
-                "name {3} missing.\n",
-                NI.getUnitOffset(), Die.getOffset(), Die.getTag(), Name);
-          });
+      ErrorCategory.Report("Name Index DIE entry missing name", [&]() {
+        error() << formatv(
+            "Name Index @ {0:x}: Entry for DIE @ {1:x} ({2}) with "
+            "name {3} missing.\n",
+            NI.getUnitOffset(), Die.getOffset(), Die.getTag(), Name);
+      });
       ++NumErrors;
     }
   }
@@ -2170,35 +2168,15 @@ bool DWARFVerifier::verifyDebugStrOffsets(
 
 void OutputCategoryAggregator::Report(
     StringRef s, std::function<void(void)> detailCallback) {
-  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)]++;
-  }
+  Aggregation[std::string(s)]++;
   if (IncludeDetail)
     detailCallback();
 }
 
 void OutputCategoryAggregator::EnumerateResults(
     std::function<void(StringRef, unsigned)> handleCounts) {
-  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) {
-      handleCounts(name, count);
-    }
+  for (auto &&[name, count] : Aggregation) {
+    handleCounts(name, count);
   }
 }
 
@@ -2225,12 +2203,6 @@ void DWARFVerifier::summarize() {
     ErrorCategory.EnumerateResults([&](StringRef Category, unsigned Count) {
       llvm::json::Object Val;
       Val.try_emplace("count", Count);
-      llvm::json::Object Details;
-      ErrorCategory.EnumerateDetailedResultsFor(
-          Category, [&](StringRef SubCategory, unsigned SubCount) {
-            Details.try_emplace(SubCategory, SubCount);
-          });
-      Val.try_emplace("details", std::move(Details));
       Categories.try_emplace(Category, std::move(Val));
       ErrorCount += Count;
     });