[DWARF parser] Use distinction between DW_AT_ranges_base and DW_AT_GNU_ranges_base instead of DWARF version

llvm-svn: 210945

1 files changed, 5 insertions, 8 deletions

diff --git a/llvm/lib/DebugInfo/DWARFUnit.cpp b/llvm/lib/DebugInfo/DWARFUnit.cpp
index 0278277..39d0a0f 100644
--- a/llvm/lib/DebugInfo/DWARFUnit.cpp
+++ b/llvm/lib/DebugInfo/DWARFUnit.cpp
@@ -225,12 +225,10 @@ size_t DWARFUnit::extractDIEsIfNeeded(bool CUDieOnly) {
     setBaseAddress(BaseAddr);
     AddrOffsetSectionBase = DieArray[0].getAttributeValueAsSectionOffset(
         this, DW_AT_GNU_addr_base, 0);
-    // Users of old DWARF may not know about DW_AT_ranges_base, so it is ignored
-    // for skeleton CU DIE (e.g. DW_AT_ranges are *not* relative to it).
-    if (Version > 4) {
-      RangeSectionBase = DieArray[0].getAttributeValueAsSectionOffset(
-          this, DW_AT_GNU_ranges_base, 0);
-    }
+    RangeSectionBase = DieArray[0].getAttributeValueAsSectionOffset(
+        this, DW_AT_ranges_base, 0);
+    // Don't fall back to DW_AT_GNU_ranges_base: it should be ignored for
+    // skeleton CU DIE, so that DWARF users not aware of it are not broken.
   }
 
   setDIERelations();
@@ -276,8 +274,7 @@ bool DWARFUnit::parseDWO() {
   }
   // Share .debug_addr and .debug_ranges section with compile unit in .dwo
   DWOCU->setAddrOffsetSection(AddrOffsetSection, AddrOffsetSectionBase);
-  uint32_t DWORangesBase = DieArray[0].getAttributeValueAsSectionOffset(
-      this, DW_AT_GNU_ranges_base, 0);
+  uint32_t DWORangesBase = DieArray[0].getRangesBaseAttribute(this, 0);
   DWOCU->setRangesSection(RangeSection, DWORangesBase);
   return true;
 }