RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Sink DwarfDebug::createScopeChildrenDIE down into DwarfCompileUnit.

Browse Source 
llvm-svn: 219422
This commit is contained in:
David Blaikie 2014-10-09 18:24:28 +00:00
parent 1ac2927c37
commit 477f8cb9ba
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
View File

@ -353,7 +353,7 @@ void DwarfCompileUnit::constructScopeDIE(
if (!ScopeDIE)
return;
// We create children when the scope DIE is not null.
DD->createScopeChildrenDIE(*this, Scope, Children);
createScopeChildrenDIE(Scope, Children);
} else {
// Early exit when we know the scope DIE is going to be null.
if (DD->isLexicalScopeDIENull(Scope))
@ -363,7 +363,7 @@ void DwarfCompileUnit::constructScopeDIE(
// We create children here when we know the scope DIE is not going to be
// null and the children will be added to the scope DIE.
DD->createScopeChildrenDIE(*this, Scope, Children, &ChildScopeCount);
createScopeChildrenDIE(Scope, Children, &ChildScopeCount);
// There is no need to emit empty lexical block DIE.
for (const auto &E : DD->findImportedEntitiesForScope(DS))
@ -550,4 +550,23 @@ std::unique_ptr<DIE> DwarfCompileUnit::constructVariableDIE(
return Var;
}
DIE *DwarfCompileUnit::createScopeChildrenDIE(
LexicalScope *Scope, SmallVectorImpl<std::unique_ptr<DIE>> &Children,
unsigned *ChildScopeCount) {
DIE *ObjectPointer = nullptr;
for (DbgVariable *DV : DD->getScopeVariables().lookup(Scope))
Children.push_back(constructVariableDIE(*DV, *Scope, ObjectPointer));
unsigned ChildCountWithoutScopes = Children.size();
for (LexicalScope *LS : Scope->getChildren())
constructScopeDIE(LS, Children);
if (ChildScopeCount)
*ChildScopeCount = Children.size() - ChildCountWithoutScopes;
return ObjectPointer;
}
} // end llvm namespace

5
lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
View File

@ -110,6 +110,11 @@ public:
std::unique_ptr<DIE> constructVariableDIE(DbgVariable &DV,
const LexicalScope &Scope,
DIE *&ObjectPointer);
/// A helper function to create children of a Scope DIE.
DIE *createScopeChildrenDIE(LexicalScope *Scope,
SmallVectorImpl<std::unique_ptr<DIE>> &Children,
unsigned *ChildScopeCount = nullptr);
};
} // end llvm namespace

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

@ -330,31 +330,11 @@ bool DwarfDebug::isLexicalScopeDIENull(LexicalScope *Scope) {
return !getLabelAfterInsn(Ranges.front().second);
}
DIE *DwarfDebug::createScopeChildrenDIE(
DwarfCompileUnit &TheCU, LexicalScope *Scope,
SmallVectorImpl<std::unique_ptr<DIE>> &Children,
unsigned *ChildScopeCount) {
DIE *ObjectPointer = nullptr;
for (DbgVariable *DV : ScopeVariables.lookup(Scope))
Children.push_back(TheCU.constructVariableDIE(*DV, *Scope, ObjectPointer));
unsigned ChildCountWithoutScopes = Children.size();
for (LexicalScope *LS : Scope->getChildren())
TheCU.constructScopeDIE(LS, Children);
if (ChildScopeCount)
*ChildScopeCount = Children.size() - ChildCountWithoutScopes;
return ObjectPointer;
}
DIE *DwarfDebug::createAndAddScopeChildren(DwarfCompileUnit &TheCU,
LexicalScope *Scope, DIE &ScopeDIE) {
// We create children when the scope DIE is not null.
SmallVector<std::unique_ptr<DIE>, 8> Children;
DIE *ObjectPointer = createScopeChildrenDIE(TheCU, Scope, Children);
DIE *ObjectPointer = TheCU.createScopeChildrenDIE(Scope, Children);
// Add children
for (auto &I : Children)
@ -1483,6 +1463,8 @@ void DwarfDebug::endFunction(const MachineFunction *MF) {
assert(ScopeVariables.empty());
assert(CurrentFnArguments.empty());
assert(DbgValues.empty());
// FIXME: This wouldn't be true in LTO with a -g (with inlining) CU followed
// by a -gmlt CU. Add a test and remove this assertion.
assert(AbstractVariables.empty());
LabelsBeforeInsn.clear();
LabelsAfterInsn.clear();

7
lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -675,14 +675,11 @@ public:
// FIXME: Sink these functions down into DwarfFile/Dwarf*Unit.
/// A helper function to create children of a Scope DIE.
DIE *createScopeChildrenDIE(DwarfCompileUnit &TheCU, LexicalScope *Scope,
SmallVectorImpl<std::unique_ptr<DIE>> &Children,
unsigned *ChildScopeCount = nullptr);
DenseMap<const MDNode *, DIE *> &getAbstractSPDies() {
return AbstractSPDies;
}
ScopeVariablesMap &getScopeVariables() { return ScopeVariables; }
};
} // End of namespace llvm