moved call inside addDwarfTypeUnitType

Author: Alexander Yermolovich

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

@@ -3704,19 +3704,19 @@ uint64_t DwarfDebug::makeTypeSignature(StringRef Identifier) {
   return Result.high();
 }
 
-bool DwarfDebug::addDwarfTypeUnitType(DwarfCompileUnit &CU,
+void DwarfDebug::addDwarfTypeUnitType(DwarfCompileUnit &CU,
                                       StringRef Identifier, DIE &RefDie,
                                       const DICompositeType *CTy) {
   // Fast path if we're building some type units and one has already used the
   // address pool we know we're going to throw away all this work anyway, so
   // don't bother building dependent types.
   if (!TypeUnitsUnderConstruction.empty() && AddrPool.hasBeenUsed())
-    return false;
+    return;
 
   auto Ins = TypeSignatures.insert(std::make_pair(CTy, 0));
   if (!Ins.second) {
     CU.addDIETypeSignature(RefDie, Ins.first->second);
-    return false;
+    return;
   }
 
   setCurrentDWARF5AccelTable(DWARF5AccelTableKind::TU);
@@ -3789,7 +3789,8 @@ bool DwarfDebug::addDwarfTypeUnitType(DwarfCompileUnit &CU,
       // they depend on addresses, throwing them out and rebuilding them.
       setCurrentDWARF5AccelTable(DWARF5AccelTableKind::CU);
       CU.constructTypeDIE(RefDie, cast<DICompositeType>(CTy));
-      return true;
+      CU.updateAcceleratorTables(CTy->getScope(), CTy, RefDie);
+      return;
     }
 
     // If the type wasn't dependent on fission addresses, finish adding the type
@@ -3811,7 +3812,7 @@ bool DwarfDebug::addDwarfTypeUnitType(DwarfCompileUnit &CU,
     setCurrentDWARF5AccelTable(DWARF5AccelTableKind::CU);
   }
   CU.addDIETypeSignature(RefDie, Signature);
-  return false;
+  return;
 }
 
 // Add the Name along with its companion DIE to the appropriate accelerator

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h

@@ -744,8 +744,7 @@ class DwarfDebug : public DebugHandlerBase {
 
   /// Add a DIE to the set of types that we're going to pull into
   /// type units.
-  /// Returns true if TU creation fails, and type was emitted in the CU.
-  bool addDwarfTypeUnitType(DwarfCompileUnit &CU, StringRef Identifier,
+  void addDwarfTypeUnitType(DwarfCompileUnit &CU, StringRef Identifier,
                             DIE &Die, const DICompositeType *CTy);
 
   /// Add a label so that arange data can be generated for it.

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

@@ -589,8 +589,7 @@ DIE *DwarfUnit::createTypeDIE(const DIScope *Context, DIE &ContextDIE,
       // Skip updating the accelerator tables since this is not the full type.
       if (MDString *TypeId = CTy->getRawIdentifier()) {
         addGlobalType(Ty, TyDIE, Context);
-        if (DD->addDwarfTypeUnitType(getCU(), TypeId->getString(), TyDIE, CTy))
-          updateAcceleratorTables(Context, Ty, TyDIE);
+        DD->addDwarfTypeUnitType(getCU(), TypeId->getString(), TyDIE, CTy);
       } else {
         updateAcceleratorTables(Context, Ty, TyDIE);
         finishNonUnitTypeDIE(TyDIE, CTy);

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h

@@ -315,6 +315,11 @@ class DwarfUnit : public DIEUnit {
   /// Get context owner's DIE.
   DIE *createTypeDIE(const DICompositeType *Ty);
 
+  /// If this is a named finished type then include it in the list of types for
+  /// the accelerator tables.
+  void updateAcceleratorTables(const DIScope *Context, const DIType *Ty,
+                               const DIE &TyDIE);
+
 protected:
   ~DwarfUnit();
 
@@ -357,11 +362,6 @@ class DwarfUnit : public DIEUnit {
 
   virtual void finishNonUnitTypeDIE(DIE& D, const DICompositeType *CTy) = 0;
 
-  /// If this is a named finished type then include it in the list of types for
-  /// the accelerator tables.
-  void updateAcceleratorTables(const DIScope *Context, const DIType *Ty,
-                               const DIE &TyDIE);
-
   virtual bool isDwoUnit() const = 0;
   const MCSymbol *getCrossSectionRelativeBaseAddress() const override;