6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

[DWARF] Fix debug info generation for function static variables, typedefs, and records

Browse Source 
Function static variables, typedefs and records (class, struct or union) declared inside
a lexical scope were associated with the function as their parent scope, rather than the
lexical scope they are defined or declared in.

This fixes PR19238

Patch by: amjad.aboud@intel.com
Differential Revision: http://reviews.llvm.org/D9758

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241153 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael Kuperstein
2015-07-01 12:33:11 +00:00
parent 5020a9198d
commit 37cb5f1c2d
8 changed files with 194 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@@ -449,14 +449,14 @@ void DwarfDebug::beginModule() {
auto *CUNode = cast<DICompileUnit>(N);
DwarfCompileUnit &CU = constructDwarfCompileUnit(CUNode);
for (auto *IE : CUNode->getImportedEntities())
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);
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);
}
for (auto *SP : CUNode->getSubprograms())
SPMap.insert(std::make_pair(SP, &CU));
for (auto *Ty : CUNode->getEnumTypes()) {
@@ -467,12 +467,23 @@ void DwarfDebug::beginModule() {
for (auto *Ty : CUNode->getRetainedTypes()) {
// The retained types array by design contains pointers to
// MDNodes rather than DIRefs. Unique them here.
CU.getOrCreateTypeDIE(cast<DIType>(resolve(Ty->getRef())));
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);
}
// 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.