Revert "[DWARF] Fix debug info generation for function static variables, typedefs, and records"
Caused PR24008
This reverts commit 37cb5f1c2db9f42d29f26b215585f56bb64ae4f5.
llvm-svn: 241176
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 86389f8..fc54a29 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -101,7 +101,7 @@
/// getOrCreateGlobalVariableDIE - get or create global variable DIE.
DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(
- const DIGlobalVariable *GV, DIE *ContextDIE) {
+ const DIGlobalVariable *GV) {
// Check for pre-existence.
if (DIE *Die = getDIE(GV))
return Die;
@@ -113,8 +113,7 @@
// Construct the context before querying for the existence of the DIE in
// case such construction creates the DIE.
- if (ContextDIE == nullptr)
- ContextDIE = getOrCreateContextDIE(GVContext);
+ DIE *ContextDIE = getOrCreateContextDIE(GVContext);
// Add to map.
DIE *VariableDIE = &createAndAddDIE(GV->getTag(), *ContextDIE, GV);
@@ -336,16 +335,17 @@
// null and the children will be added to the scope DIE.
createScopeChildrenDIE(Scope, Children, &ChildScopeCount);
-
- DwarfDebug::LocalDeclMapRange LocalDeclNodeRangeForScope(nullptr, nullptr);
- // Skip local decls in gmlt-like data.
- if (!includeMinimalInlineScopes())
- LocalDeclNodeRangeForScope = DD->findLocalDeclNodesForScope(DS);
+ // Skip imported directives in gmlt-like data.
+ if (!includeMinimalInlineScopes()) {
+ // There is no need to emit empty lexical block DIE.
+ for (const auto &E : DD->findImportedEntitiesForScope(DS))
+ Children.push_back(
+ constructImportedEntityDIE(cast<DIImportedEntity>(E.second)));
+ }
// If there are only other scopes as children, put them directly in the
// parent instead, as this scope would serve no purpose.
- if (Children.size() == ChildScopeCount &&
- empty(LocalDeclNodeRangeForScope)) {
+ if (Children.size() == ChildScopeCount) {
FinalChildren.insert(FinalChildren.end(),
std::make_move_iterator(Children.begin()),
std::make_move_iterator(Children.end()));
@@ -353,15 +353,6 @@
}
ScopeDIE = constructLexicalScopeDIE(Scope);
assert(ScopeDIE && "Scope DIE should not be null.");
-
- for (const auto &DI : LocalDeclNodeRangeForScope) {
- if (auto *IE = dyn_cast<DIImportedEntity>(DI.second))
- Children.push_back(constructImportedEntityDIE(IE));
- else if (auto *GV = dyn_cast<DIGlobalVariable>(DI.second))
- getOrCreateGlobalVariableDIE(GV, ScopeDIE);
- else if (auto *RT = dyn_cast<DIType>(DI.second))
- getOrCreateTypeDIE(RT, ScopeDIE);
- }
}
// Add children
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
index 132b068..509c943 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
@@ -77,11 +77,8 @@
/// Apply the DW_AT_stmt_list from this compile unit to the specified DIE.
void applyStmtList(DIE &D);
- /// Get or create global variable DIE.
- /// \param GV Global Variable Node
- /// \param ContextDIE DIE scope for GV Node, if available.
- DIE *getOrCreateGlobalVariableDIE(const DIGlobalVariable *GV,
- DIE *ContextDIE = nullptr);
+ /// getOrCreateGlobalVariableDIE - get or create global variable DIE.
+ DIE *getOrCreateGlobalVariableDIE(const DIGlobalVariable *GV);
/// addLabelAddress - Add a dwarf label attribute data and value using
/// either DW_FORM_addr or DW_FORM_GNU_addr_index.
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 363311e..7d03a39 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -449,14 +449,14 @@
auto *CUNode = cast<DICompileUnit>(N);
DwarfCompileUnit &CU = constructDwarfCompileUnit(CUNode);
for (auto *IE : CUNode->getImportedEntities())
- ScopesWithLocalDeclNodes.push_back(std::make_pair(IE->getScope(), IE));
- for (auto *GV : CUNode->getGlobalVariables()) {
- auto *Context = GV->getScope();
- if (Context && isa<DILexicalBlockBase>(Context))
- ScopesWithLocalDeclNodes.push_back(std::make_pair(Context, GV));
- else
- CU.getOrCreateGlobalVariableDIE(GV);
- }
+ ScopesWithImportedEntities.push_back(std::make_pair(IE->getScope(), IE));
+ // Stable sort to preserve the order of appearance of imported entities.
+ // This is to avoid out-of-order processing of interdependent declarations
+ // within the same scope, e.g. { namespace A = base; namespace B = A; }
+ std::stable_sort(ScopesWithImportedEntities.begin(),
+ ScopesWithImportedEntities.end(), less_first());
+ for (auto *GV : CUNode->getGlobalVariables())
+ CU.getOrCreateGlobalVariableDIE(GV);
for (auto *SP : CUNode->getSubprograms())
SPMap.insert(std::make_pair(SP, &CU));
for (auto *Ty : CUNode->getEnumTypes()) {
@@ -467,23 +467,12 @@
for (auto *Ty : CUNode->getRetainedTypes()) {
// The retained types array by design contains pointers to
// MDNodes rather than DIRefs. Unique them here.
- DIType *RT = cast<DIType>(resolve(Ty->getRef()));
- auto *Context = resolve(Ty->getScope());
- if (Context && isa<DILexicalBlockBase>(Context))
- ScopesWithLocalDeclNodes.push_back(std::make_pair(Context, RT));
- else
- CU.getOrCreateTypeDIE(RT);
+ CU.getOrCreateTypeDIE(cast<DIType>(resolve(Ty->getRef())));
}
// Emit imported_modules last so that the relevant context is already
// available.
for (auto *IE : CUNode->getImportedEntities())
constructAndAddImportedEntityDIE(CU, IE);
-
- // Stable sort to preserve the order of appearance of imported entities.
- // This is to avoid out-of-order processing of interdependent declarations
- // within the same scope, e.g. { namespace A = base; namespace B = A; }
- std::stable_sort(ScopesWithLocalDeclNodes.begin(),
- ScopesWithLocalDeclNodes.end(), less_first());
}
// Tell MMI that we have debug info.
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 3a583e7..1c3e2ae 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -278,10 +278,13 @@
// Holder for the file specific debug information.
DwarfFile InfoHolder;
- // Holder for local declaration DI nodes per scope.
+ // Holders for the various debug information flags that we might need to
+ // have exposed. See accessor functions below for description.
+
+ // Holder for imported entities.
typedef SmallVector<std::pair<const MDNode *, const MDNode *>, 32>
- LocalDeclMap;
- LocalDeclMap ScopesWithLocalDeclNodes;
+ ImportedEntityMap;
+ ImportedEntityMap ScopesWithImportedEntities;
// Map from MDNodes for user-defined types to the type units that describe
// them.
@@ -616,12 +619,10 @@
const MachineFunction *getCurrentFunction() const { return CurFn; }
- typedef iterator_range<LocalDeclMap::const_iterator> LocalDeclMapRange;
-
- LocalDeclMapRange findLocalDeclNodesForScope(const MDNode *Scope) const {
- assert(DILexicalBlockBase::classof(Scope) && "Expected LexicalBlock scope");
+ iterator_range<ImportedEntityMap::const_iterator>
+ findImportedEntitiesForScope(const MDNode *Scope) const {
return make_range(std::equal_range(
- ScopesWithLocalDeclNodes.begin(), ScopesWithLocalDeclNodes.end(),
+ ScopesWithImportedEntities.begin(), ScopesWithImportedEntities.end(),
std::pair<const MDNode *, const MDNode *>(Scope, nullptr),
less_first()));
}
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 6334be5..3555822 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -704,7 +704,7 @@
return &TyDIE;
}
-DIE *DwarfUnit::getOrCreateTypeDIE(const MDNode *TyNode, DIE *ContextDIE) {
+DIE *DwarfUnit::getOrCreateTypeDIE(const MDNode *TyNode) {
if (!TyNode)
return nullptr;
@@ -714,20 +714,17 @@
// DW_TAG_restrict_type is not supported in DWARF2
if (Ty->getTag() == dwarf::DW_TAG_restrict_type && DD->getDwarfVersion() <= 2)
- return getOrCreateTypeDIE(resolve(cast<DIDerivedType>(Ty)->getBaseType()),
- ContextDIE);
+ return getOrCreateTypeDIE(resolve(cast<DIDerivedType>(Ty)->getBaseType()));
// Construct the context before querying for the existence of the DIE in case
// such construction creates the DIE.
auto *Context = resolve(Ty->getScope());
- if (ContextDIE == nullptr)
- ContextDIE = getOrCreateContextDIE(Context);
+ DIE *ContextDIE = getOrCreateContextDIE(Context);
+ assert(ContextDIE);
if (DIE *TyDIE = getDIE(Ty))
return TyDIE;
- assert(ContextDIE);
-
// Create new type.
DIE &TyDIE = createAndAddDIE(Ty->getTag(), *ContextDIE, Ty);
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
index 3f48099..4000ae4 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.h
@@ -298,9 +298,7 @@
bool Minimal = false);
/// \brief Find existing DIE or create new DIE for the given type.
- /// \param N Type Node
- /// \param ContextDIE DIE scope for N Node, if available.
- DIE *getOrCreateTypeDIE(const MDNode *N, DIE *ContextDIE = nullptr);
+ DIE *getOrCreateTypeDIE(const MDNode *N);
/// \brief Get context owner's DIE.
DIE *createTypeDIE(const DICompositeType *Ty);