Not formatted, mostly to keep the current model easy to see

Author: Kevin Frei

llvm/include/llvm/DebugInfo/DIContext.h

@@ -205,6 +205,7 @@ struct DIDumpOptions {
   bool DisplayRawContents = false;
   bool IsEH = false;
   bool DumpNonSkeleton = false;
+  bool DumpAggregateErrors = true;
   std::function<llvm::StringRef(uint64_t DwarfRegNum, bool IsEH)>
       GetNameForDWARFReg;
 

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

@@ -77,15 +77,32 @@ class DWARFVerifier {
   };
 
 private:
+  class ErrorAggregator {
+  private:
+    DWARFVerifier &Verifier;
+    std::map<std::string, int> UniqueErrors;
+    static std::string Clean(const char *s);
+
+  public:
+    ErrorAggregator(DWARFVerifier &v) : Verifier(v) {}
+    raw_ostream &operator<<(const char *s);
+    void Collect(const std::string &s);
+    void Dump();
+  };
+  friend class ErrorAggregator;
+
   raw_ostream &OS;
   DWARFContext &DCtx;
+  ErrorAggregator ErrAggregation;
   DIDumpOptions DumpOpts;
   uint32_t NumDebugLineErrors = 0;
   // Used to relax some checks that do not currently work portably
   bool IsObjectFile;
   bool IsMachOObject;
   using ReferenceMap = std::map<uint64_t, std::set<uint64_t>>;
 
+  raw_ostream &aggregate(const char *);
+  ErrorAggregator &aggregate();
   raw_ostream &error() const;
   raw_ostream &warn() const;
   raw_ostream &note() const;
@@ -348,6 +365,9 @@ class DWARFVerifier {
   bool verifyDebugStrOffsets(
       StringRef SectionName, const DWARFSection &Section, StringRef StrData,
       void (DWARFObject::*)(function_ref<void(const DWARFSection &)>) const);
+
+  /// Emits any aggregate information collection, depending on the dump options
+  void finish();
 };
 
 static inline bool operator<(const DWARFVerifier::DieRangeInfo &LHS,

llvm/lib/DebugInfo/DWARF/DWARFContext.cpp

@@ -1408,6 +1408,7 @@ bool DWARFContext::verify(raw_ostream &OS, DIDumpOptions DumpOpts) {
   if (DumpOpts.DumpType & DIDT_DebugStrOffsets)
     Success &= verifier.handleDebugStrOffsets();
   Success &= verifier.handleAccelTables();
+  verifier.finish();
   return Success;
 }