mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-23 01:24:30 +00:00
Support for nested functions/classes in debug output. Radar 7424645.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@104841 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -866,6 +866,10 @@ void DwarfDebug::addToContextOwner(DIE *Die, DIDescriptor Context) {
|
||||
} else if (Context.isNameSpace()) {
|
||||
DIE *ContextDIE = getOrCreateNameSpace(DINameSpace(Context));
|
||||
ContextDIE->addChild(Die);
|
||||
} else if (Context.isSubprogram()) {
|
||||
DIE *ContextDIE = createSubprogramDIE(DISubprogram(Context),
|
||||
/*MakeDecl=*/false);
|
||||
ContextDIE->addChild(Die);
|
||||
} else if (DIE *ContextDIE = getCompileUnit(Context)->getDIE(Context))
|
||||
ContextDIE->addChild(Die);
|
||||
else
|
||||
@ -1055,6 +1059,10 @@ void DwarfDebug::constructTypeDIE(DIE &Buffer, DICompositeType CTy) {
|
||||
if (DIDescriptor(ContainingType).isCompositeType())
|
||||
addDIEEntry(&Buffer, dwarf::DW_AT_containing_type, dwarf::DW_FORM_ref4,
|
||||
getOrCreateTypeDIE(DIType(ContainingType)));
|
||||
else {
|
||||
DIDescriptor Context = CTy.getContext();
|
||||
addToContextOwner(&Buffer, Context);
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@ -1329,6 +1337,9 @@ DIE *DwarfDebug::createSubprogramDIE(const DISubprogram &SP, bool MakeDecl) {
|
||||
// DW_TAG_inlined_subroutine may refer to this DIE.
|
||||
SPCU->insertDIE(SP, SPDie);
|
||||
|
||||
// Add to context owner.
|
||||
addToContextOwner(SPDie, SP.getContext());
|
||||
|
||||
return SPDie;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user