Address review comments

Author: dzhidzhoev

llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp

@@ -103,12 +103,10 @@ DebugHandlerBase::DebugHandlerBase(AsmPrinter *A) : Asm(A), MMI(Asm->MMI) {}
 DebugHandlerBase::~DebugHandlerBase() = default;
 
 void DebugHandlerBase::beginModule(Module *M) {
-  if (M->debug_compile_units().empty()) {
+  if (M->debug_compile_units().empty())
     Asm = nullptr;
-    return;
-  }
-
-  LScopes.initialize(*M);
+  else
+    LScopes.initialize(*M);
 }
 
 // Each LexicalScope has first instruction and last instruction to mark

llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp

@@ -1251,17 +1251,15 @@ void DwarfCompileUnit::constructAbstractSubprogramScopeDIE(
     LexicalScope *Scope) {
   auto *SP = cast<DISubprogram>(Scope->getScopeNode());
 
-  if (getFinalizedAbstractSubprograms().contains(SP)) {
+  // Populate subprogram DIE only once.
+  if (!getFinalizedAbstractSubprograms().insert(SP).second)
     return;
-  }
 
   auto [ContextDIE, ContextCU] = getOrCreateAbstractSubprogramContextDIE(SP);
   DIE *AbsDef = getAbstractScopeDIEs().lookup(SP);
   if (!AbsDef)
     AbsDef = &createAbstractSubprogramDIE(SP, ContextDIE, ContextCU);
 
-  getFinalizedAbstractSubprograms().insert(SP);
-
   if (DIE *ObjectPointer = ContextCU->createAndAddScopeChildren(Scope, *AbsDef))
     ContextCU->addDIEEntry(*AbsDef, dwarf::DW_AT_object_pointer,
                            *ObjectPointer);

llvm/lib/CodeGen/AsmPrinter/DwarfFile.h

@@ -96,6 +96,7 @@ class DwarfFile {
   // Collection of abstract subprogram DIEs.
   DenseMap<const DILocalScope *, DIE *> AbstractLocalScopeDIEs;
   DenseMap<const DINode *, std::unique_ptr<DbgEntity>> AbstractEntities;
+  /// Keeps track of abstract subprograms to populate them only once.
   // FIXME: merge creation and population of abstract scopes.
   SmallPtrSet<const DISubprogram *, 8> FinalizedAbstractSubprograms;