[llvm] db797bf - DebugInfo: Remove redundant conditionals/checks from macro info emission

[David Blaikie via llvm-commits]

Author: David Blaikie
Date: 2019-11-08T15:31:15-08:00
New Revision: db797bfb2bd24e40d8f0ed422fd4087894ed0eab

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

LOG: DebugInfo: Remove redundant conditionals/checks from macro info emission

These checks fall out naturally from the current implementation without
needing to be explicitly considered anymore.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 56615584a186..4b8a44da3e16 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -2729,30 +2729,20 @@ void DwarfDebug::emitMacroFile(DIMacroFile &F, DwarfCompileUnit &U) {
 
 /// Emit macros into a debug macinfo section.
 void DwarfDebug::emitDebugMacinfo() {
-  if (CUMap.empty())
-    return;
-
-  if (llvm::all_of(CUMap, [](const decltype(CUMap)::value_type &Pair) {
-        return Pair.second->getCUNode()->isDebugDirectivesOnly();
-      }))
-    return;
-
   for (const auto &P : CUMap) {
     auto &TheCU = *P.second;
-    if (TheCU.getCUNode()->isDebugDirectivesOnly())
-      continue;
     auto *SkCU = TheCU.getSkeleton();
     DwarfCompileUnit &U = SkCU ? *SkCU : TheCU;
     auto *CUNode = cast<DICompileUnit>(P.first);
     DIMacroNodeArray Macros = CUNode->getMacros();
-    if (!Macros.empty()) {
-      Asm->OutStreamer->SwitchSection(
-          Asm->getObjFileLowering().getDwarfMacinfoSection());
-      Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
-      handleMacroNodes(Macros, U);
-      Asm->OutStreamer->AddComment("End Of Macro List Mark");
-      Asm->emitInt8(0);
-    }
+    if (Macros.empty())
+      continue;
+    Asm->OutStreamer->SwitchSection(
+        Asm->getObjFileLowering().getDwarfMacinfoSection());
+    Asm->OutStreamer->EmitLabel(U.getMacroLabelBegin());
+    handleMacroNodes(Macros, U);
+    Asm->OutStreamer->AddComment("End Of Macro List Mark");
+    Asm->emitInt8(0);
   }
 }