Reverting 100048; it broke two Frontend debug info tests.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100058 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index e3cf13a..d81c304 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -780,26 +780,12 @@
} else if (Context.isNameSpace()) {
DIE *ContextDIE = getOrCreateNameSpace(DINameSpace(Context.getNode()));
ContextDIE->addChild(Die);
- } else if (Context.isSubprogram()) {
- DIE *ContextDIE = createSubprogramDIE(DISubprogram(Context.getNode()),
- /*MakeDecl=*/false);
- ContextDIE->addChild(Die);
} else if (DIE *ContextDIE = ModuleCU->getDIE(Context.getNode()))
ContextDIE->addChild(Die);
else
ModuleCU->addDie(Die);
}
-/// isFunctionContext - True if given Context is nested within a function.
-bool DwarfDebug::isFunctionContext(DIE *context) {
- if (context == (DIE *)0)
- return false;
- if (context->getTag() == dwarf::DW_TAG_subprogram)
- return true;
- else
- return isFunctionContext(context->getParent());
-}
-
/// getOrCreateTypeDIE - Find existing DIE or create new DIE for the
/// given DIType.
DIE *DwarfDebug::getOrCreateTypeDIE(DIType Ty) {
@@ -981,10 +967,6 @@
if (DIDescriptor(ContainingType.getNode()).isCompositeType())
addDIEEntry(&Buffer, dwarf::DW_AT_containing_type, dwarf::DW_FORM_ref4,
getOrCreateTypeDIE(DIType(ContainingType.getNode())));
- else {
- DIDescriptor Context = CTy.getContext();
- addToContextOwner(&Buffer, Context);
- }
break;
}
default:
@@ -1343,7 +1325,8 @@
// function then gdb prefers the definition at top level and but does not
// expect specification DIE in parent function. So avoid creating
// specification DIE for a function defined inside a function.
- if (SP.isDefinition() && !isFunctionContext(SPDie->getParent())) {
+ if (SP.isDefinition() && !SP.getContext().isCompileUnit() &&
+ !SP.getContext().isFile() && !SP.getContext().isSubprogram()) {
addUInt(SPDie, dwarf::DW_AT_declaration, dwarf::DW_FORM_flag, 1);
// Add arguments.
@@ -1771,15 +1754,19 @@
void DwarfDebug::constructSubprogramDIE(MDNode *N) {
DISubprogram SP(N);
+ // Check for pre-existence.
+ if (ModuleCU->getDIE(N))
+ return;
+
if (!SP.isDefinition())
// This is a method declaration which will be handled while constructing
// class type.
return;
- // Check for pre-existence.
- DIE *SubprogramDie = ModuleCU->getDIE(N);
- if (!SubprogramDie)
- SubprogramDie = createSubprogramDIE(SP);
+ DIE *SubprogramDie = createSubprogramDIE(SP);
+
+ // Add to map.
+ ModuleCU->insertDIE(N, SubprogramDie);
// Add to context owner.
addToContextOwner(SubprogramDie, SP.getContext());