maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

DebugInfo: Remove DwarfDebug::addScopeVariable now that it's just a trivial wrapper 

llvm-svn: 220542
This commit is contained in:
David Blaikie 2014-10-24 00:43:47 +00:00
parent 26f63f77cd
commit f4c504e03c
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -770,7 +770,7 @@ DbgVariable *DwarfDebug::getExistingAbstractVariable(const DIVariable &DV) {
void DwarfDebug::createAbstractVariable(const DIVariable &Var,
LexicalScope *Scope) {
auto AbsDbgVariable = make_unique<DbgVariable>(Var, DIExpression(), this);
InfoHolder.addNonArgumentScopeVariable(Scope, AbsDbgVariable.get());
InfoHolder.addScopeVariable(Scope, AbsDbgVariable.get());
AbstractVariables[Var] = std::move(AbsDbgVariable);
}
@ -813,7 +813,7 @@ void DwarfDebug::collectVariableInfoFromMMITable(
ConcreteVariables.push_back(make_unique<DbgVariable>(DV, Expr, this));
DbgVariable *RegVar = ConcreteVariables.back().get();
RegVar->setFrameIndex(VI.Slot);
addScopeVariable(Scope, RegVar);
InfoHolder.addScopeVariable(Scope, RegVar);
}
}
@ -993,7 +993,7 @@ DwarfDebug::collectVariableInfo(DwarfCompileUnit &TheCU, DISubprogram SP,
ensureAbstractVariableIsCreatedIfScoped(DV, Scope->getScopeNode());
ConcreteVariables.push_back(make_unique<DbgVariable>(MInsn, this));
DbgVariable *RegVar = ConcreteVariables.back().get();
addScopeVariable(Scope, RegVar);
InfoHolder.addScopeVariable(Scope, RegVar);
// Check if the first DBG_VALUE is valid for the rest of the function.
if (Ranges.size() == 1 && Ranges.front().second == nullptr)
@ -1023,7 +1023,7 @@ DwarfDebug::collectVariableInfo(DwarfCompileUnit &TheCU, DISubprogram SP,
ensureAbstractVariableIsCreatedIfScoped(DV, Scope->getScopeNode());
DIExpression NoExpr;
ConcreteVariables.push_back(make_unique<DbgVariable>(DV, NoExpr, this));
addScopeVariable(Scope, ConcreteVariables.back().get());
InfoHolder.addScopeVariable(Scope, ConcreteVariables.back().get());
}
}
}
@ -1253,10 +1253,6 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
}
}
void DwarfDebug::addScopeVariable(LexicalScope *LS, DbgVariable *Var) {
InfoHolder.addNonArgumentScopeVariable(LS, Var);
}
// Gather and emit post-function debug information.
void DwarfDebug::endFunction(const MachineFunction *MF) {
assert(CurFn == MF &&

2
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -330,8 +330,6 @@ class DwarfDebug : public AsmPrinterHandler {
MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
void addScopeVariable(LexicalScope *LS, DbgVariable *Var);
const SmallVectorImpl<std::unique_ptr<DwarfUnit>> &getUnits() {
return InfoHolder.getUnits();
}

3
llvm/lib/CodeGen/AsmPrinter/DwarfFile.cpp
View File

@ -155,8 +155,7 @@ void DwarfFile::emitStrings(const MCSection *StrSection,
StrPool.emit(*Asm, StrSection, OffsetSection);
}
void DwarfFile::addNonArgumentScopeVariable(LexicalScope *LS,
DbgVariable *Var) {
void DwarfFile::addScopeVariable(LexicalScope *LS, DbgVariable *Var) {
SmallVectorImpl<DbgVariable *> &Vars = DD.getScopeVariables()[LS];
DIVariable DV = Var->getVariable();
// Variables with positive arg numbers are parameters.

2
llvm/lib/CodeGen/AsmPrinter/DwarfFile.h
View File

@ -84,7 +84,7 @@ public:
/// \brief Returns the string pool.
DwarfStringPool &getStringPool() { return StrPool; }
void addNonArgumentScopeVariable(LexicalScope *LS, DbgVariable *Var);
void addScopeVariable(LexicalScope *LS, DbgVariable *Var);
};
}
#endif