commit d7c6fdbcd5701c5f17d1fa563b21bca3494b34de
author Alexey Bataev <a.bataev@hotmail.com> Thu Mar 01 14:32:37 2018 +0000
committer Alexey Bataev <a.bataev@hotmail.com> Thu Mar 01 14:32:37 2018 +0000
tree 7cb875ec8dbf7a17be2aefd1f148492f906b0450
parent b0f051ae63e02f135cf8550deefc3e349c77b546

Revert "[DEBUGINFO] Add flag for DWARF2 or less to use sections as references."

This reverts commit r326328 to remove checks for emission of certain
sections after discussion with Eric Christofer.

llvm-svn: 326436

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 3a75530..2caf9c9 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -123,13 +123,6 @@
                             clEnumVal(Disable, "Disabled")),
                  cl::init(Default));
 
-static cl::opt<DefaultOnOff> DwarfSectionsAsReferences(
-    "dwarf-sections-as-references", cl::Hidden,
-    cl::desc("Use sections+offset as references rather than labels."),
-    cl::values(clEnumVal(Default, "Default for platform"),
-               clEnumVal(Enable, "Enabled"), clEnumVal(Disable, "Disabled")),
-    cl::init(Default));
-
 enum LinkageNameOption {
   DefaultLinkageNames,
   AllLinkageNames,
@@ -317,10 +310,6 @@
   // Use dwarf 4 by default if nothing is requested.
   DwarfVersion = DwarfVersion ? DwarfVersion : dwarf::DWARF_VERSION;
 
-  // Use sections as references in DWARF v2.
-  UseSectionsAsReferences =
-      DwarfVersion == 2 && DwarfSectionsAsReferences == Enable;
-
   // Work around a GDB bug. GDB doesn't support the standard opcode;
   // SCE doesn't support GNU's; LLDB prefers the standard opcode, which
   // is defined as of DWARF 3.
@@ -748,7 +737,7 @@
     // ranges for all subprogram DIEs for mach-o.
     DwarfCompileUnit &U = SkCU ? *SkCU : TheCU;
     if (unsigned NumRanges = TheCU.getRanges().size()) {
-      if (NumRanges > 1 && !useSectionsAsReferences())
+      if (NumRanges > 1)
         // A DW_AT_low_pc attribute may also be specified in combination with
         // DW_AT_ranges to specify the default base address for use in
         // location lists (see Section 2.6.2) and range lists (see Section
@@ -1576,13 +1565,7 @@
   Asm->EmitInt16(dwarf::DW_PUBNAMES_VERSION);
 
   Asm->OutStreamer->AddComment("Offset of Compilation Unit Info");
-  if (useSectionsAsReferences()) {
-    Asm->EmitLabelPlusOffset(TheU->getSection()->getBeginSymbol(),
-                             TheU->getDebugSectionOffset(),
-                             Asm->MAI->getCodePointerSize());
-  } else {
-    Asm->emitDwarfSymbolReference(TheU->getLabelBegin());
-  }
+  Asm->emitDwarfSymbolReference(TheU->getLabelBegin());
 
   Asm->OutStreamer->AddComment("Compilation Unit Length");
   Asm->EmitInt32(TheU->getLength());
@@ -1881,13 +1864,7 @@
     Asm->OutStreamer->AddComment("DWARF Arange version number");
     Asm->EmitInt16(dwarf::DW_ARANGES_VERSION);
     Asm->OutStreamer->AddComment("Offset Into Debug Info Section");
-    if (useSectionsAsReferences()) {
-      Asm->EmitLabelPlusOffset(CU->getSection()->getBeginSymbol(),
-                               CU->getDebugSectionOffset(),
-                               Asm->MAI->getCodePointerSize());
-    } else {
-      Asm->emitDwarfSymbolReference(CU->getLabelBegin());
-    }
+    Asm->emitDwarfSymbolReference(CU->getLabelBegin());
     Asm->OutStreamer->AddComment("Address Size (in bytes)");
     Asm->EmitInt8(PtrSize);
     Asm->OutStreamer->AddComment("Segment Size (in bytes)");