Revert "DebugInfo: reduce DIE range verification on object files"

This reverts commit 2b4cee4.

Author: adrian-prantl

include/llvm/DebugInfo/DWARF/DWARFVerifier.h

@@ -97,9 +97,6 @@ class DWARFVerifier {
   /// lies between to valid DIEs.
   std::map<uint64_t, std::set<uint32_t>> ReferenceToDIEOffsets;
   uint32_t NumDebugLineErrors = 0;
-  // Used to relax some checks that do not currently work portably
-  bool IsObjectFile;
-  bool IsMachOObject;
 
   raw_ostream &error() const;
   raw_ostream &warn() const;
@@ -289,8 +286,8 @@ class DWARFVerifier {
 
 public:
   DWARFVerifier(raw_ostream &S, DWARFContext &D,
-                DIDumpOptions DumpOpts = DIDumpOptions::getForSingleDIE());
-
+                DIDumpOptions DumpOpts = DIDumpOptions::getForSingleDIE())
+      : OS(S), DCtx(D), DumpOpts(std::move(DumpOpts)) {}
   /// Verify the information in any of the following sections, if available:
   /// .debug_abbrev, debug_abbrev.dwo
   ///

lib/DebugInfo/DWARF/DWARFVerifier.cpp

@@ -379,42 +379,20 @@ unsigned DWARFVerifier::verifyDieRanges(const DWARFDie &Die,
   // Build RI for this DIE and check that ranges within this DIE do not
   // overlap.
   DieRangeInfo RI(Die);
+  for (auto Range : Ranges) {
+    if (!Range.valid()) {
+      ++NumErrors;
+      error() << "Invalid address range " << Range << "\n";
+      continue;
+    }
 
-  // TODO support object files better
-  //
-  // Some object file formats (i.e. non-MachO) support COMDAT.  ELF in
-  // particular does so by placing each function into a section.  The DWARF data
-  // for the function at that point uses a section relative DW_FORM_addrp for
-  // the DW_AT_low_pc and a DW_FORM_data4 for the offset as the DW_AT_high_pc.
-  // In such a case, when the Die is the CU, the ranges will overlap, and we
-  // will flag valid conflicting ranges as invalid.
-  //
-  // For such targets, we should read the ranges from the CU and partition them
-  // by the section id.  The ranges within a particular section should be
-  // disjoint, although the ranges across sections may overlap.  We would map
-  // the child die to the entity that it references and the section with which
-  // it is associated.  The child would then be checked against the range
-  // information for the associated section.
-  //
-  // For now, simply elide the range verification for the CU DIEs if we are
-  // processing an object file.
-
-  if (!IsObjectFile || IsMachOObject || Die.getTag() == DW_TAG_subprogram) {
-    for (auto Range : Ranges) {
-      if (!Range.valid()) {
-        ++NumErrors;
-        error() << "Invalid address range " << Range << "\n";
-        continue;
-      }
-
-      // Verify that ranges don't intersect.
-      const auto IntersectingRange = RI.insert(Range);
-      if (IntersectingRange != RI.Ranges.end()) {
-        ++NumErrors;
-        error() << "DIE has overlapping address ranges: " << Range << " and "
-                << *IntersectingRange << "\n";
-        break;
-      }
+    // Verify that ranges don't intersect.
+    const auto IntersectingRange = RI.insert(Range);
+    if (IntersectingRange != RI.Ranges.end()) {
+      ++NumErrors;
+      error() << "DIE has overlapping address ranges: " << Range << " and "
+              << *IntersectingRange << "\n";
+      break;
     }
   }
 
@@ -743,15 +721,6 @@ void DWARFVerifier::verifyDebugLineRows() {
   }
 }
 
-DWARFVerifier::DWARFVerifier(raw_ostream &S, DWARFContext &D,
-                             DIDumpOptions DumpOpts)
-    : OS(S), DCtx(D), DumpOpts(std::move(DumpOpts)) {
-  if (const auto *F = DCtx.getDWARFObj().getFile()) {
-    IsObjectFile = F->isRelocatableObject();
-    IsMachOObject = F->isMachO();
-  }
-}
-
 bool DWARFVerifier::handleDebugLine() {
   NumDebugLineErrors = 0;
   OS << "Verifying .debug_line...\n";