[llvm] 6ade2de - Revert "DebugInfo: Temporarily work around -gsplit-dwarf + LTO .debug_gnu_pubnames regression after D94976"

[Jeremy Morse via llvm-commits]

Author: Jeremy Morse
Date: 2021-02-08T12:41:01Z
New Revision: 6ade2dea7bd45bb208abdf2f47608f19940bccd2

URL: https://github.com/llvm/llvm-project/commit/6ade2dea7bd45bb208abdf2f47608f19940bccd2
DIFF: https://github.com/llvm/llvm-project/commit/6ade2dea7bd45bb208abdf2f47608f19940bccd2.diff

LOG: Revert "DebugInfo: Temporarily work around -gsplit-dwarf + LTO .debug_gnu_pubnames regression after D94976"

Backing out this workaround to focus on fixing whatever's wrong with
.debug_gnu_pubnames, I'll revert the cause, (8998f584) in the next commit.

This reverts commit 56fa34ae3570a34fd0f4c2cf1bfaf095da01a959.

Added: 
    

Modified: 
    llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 396df74722bf..23b347f8c907 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -551,9 +551,7 @@ DIE *DwarfUnit::getOrCreateContextDIE(const DIScope *Context) {
   if (auto *SP = dyn_cast<DISubprogram>(Context)) {
     assert(SP->isDefinition());
     // When generating type units, each unit gets its own subprogram.
-    // FIXME: constructSubprogramDefinitionDIE may produce .debug_gnu_pubnames
-    // with 0 DIE Offset entries with split dwarf.
-    if (DD->generateTypeUnits() || DD->useSplitDwarf())
+    if (DD->generateTypeUnits())
       return getOrCreateSubprogramDIE(SP);
 
     // Subprogram definitions should be created in the Unit that they specify,