6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-26 05:25:47 +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/DwarfCompileUnit.cpp
View File

@@ -101,7 +101,7 @@ static const ConstantExpr *getMergedGlobalExpr(const Value *V) {
/// getOrCreateGlobalVariableDIE - get or create global variable DIE.
DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(
const DIGlobalVariable *GV) {
const DIGlobalVariable *GV, DIE *ContextDIE) {
// Check for pre-existence.
if (DIE *Die = getDIE(GV))
return Die;
@@ -113,7 +113,8 @@ DIE *DwarfCompileUnit::getOrCreateGlobalVariableDIE(
// Construct the context before querying for the existence of the DIE in
// case such construction creates the DIE.
DIE *ContextDIE = getOrCreateContextDIE(GVContext);
if (ContextDIE == nullptr)
ContextDIE = getOrCreateContextDIE(GVContext);
// Add to map.
DIE *VariableDIE = &createAndAddDIE(GV->getTag(), *ContextDIE, GV);
@@ -335,17 +336,16 @@ void DwarfCompileUnit::constructScopeDIE(
// null and the children will be added to the scope DIE.
createScopeChildrenDIE(Scope, Children, &ChildScopeCount);
// 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)));
}
DwarfDebug::LocalDeclMapRange LocalDeclNodeRangeForScope(nullptr, nullptr);
// Skip local decls in gmlt-like data.
if (!includeMinimalInlineScopes())
LocalDeclNodeRangeForScope = DD->findLocalDeclNodesForScope(DS);
// 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) {
if (Children.size() == ChildScopeCount &&
empty(LocalDeclNodeRangeForScope)) {
FinalChildren.insert(FinalChildren.end(),
std::make_move_iterator(Children.begin()),
std::make_move_iterator(Children.end()));
@@ -353,6 +353,15 @@ void DwarfCompileUnit::constructScopeDIE(
}
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