6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-22 10:24:26 +00:00
Code Issues Projects Releases Wiki Activity

DebugInfo: Roll argument insertion into variable insertion to ensure arguments are correctly handled in all cases.

Browse Source 
No functional change intended.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210233 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2014-06-05 01:04:20 +00:00
parent ad03fa6d3f
commit 75096077d4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,7 +1134,6 @@ void DwarfDebug::collectVariableInfoFromMMITable(
DbgVariable *AbsDbgVariable = findAbstractVariable(DV, VI.Loc); DbgVariable *AbsDbgVariable = findAbstractVariable(DV, VI.Loc);
DbgVariable *RegVar = new DbgVariable(DV, AbsDbgVariable, this); DbgVariable *RegVar = new DbgVariable(DV, AbsDbgVariable, this);
RegVar->setFrameIndex(VI.Slot); RegVar->setFrameIndex(VI.Slot);
if (!addCurrentFnArgument(RegVar, Scope))
addScopeVariable(Scope, RegVar); addScopeVariable(Scope, RegVar);
} }
} }
@ -1202,7 +1201,6 @@ DwarfDebug::collectVariableInfo(SmallPtrSet<const MDNode *, 16> &Processed) {
assert(MInsn->isDebugValue() && "History must begin with debug value"); assert(MInsn->isDebugValue() && "History must begin with debug value");
DbgVariable *AbsVar = findAbstractVariable(DV, Scope->getScopeNode()); DbgVariable *AbsVar = findAbstractVariable(DV, Scope->getScopeNode());
DbgVariable *RegVar = new DbgVariable(MInsn, AbsVar, this); DbgVariable *RegVar = new DbgVariable(MInsn, AbsVar, this);
if (!addCurrentFnArgument(RegVar, Scope))
addScopeVariable(Scope, RegVar); addScopeVariable(Scope, RegVar);
// Check if the first DBG_VALUE is valid for the rest of the function. // Check if the first DBG_VALUE is valid for the rest of the function.
@ -1257,7 +1255,6 @@ DwarfDebug::collectVariableInfo(SmallPtrSet<const MDNode *, 16> &Processed) {
if (LexicalScope *Scope = LScopes.findLexicalScope(DV.getContext())) { if (LexicalScope *Scope = LScopes.findLexicalScope(DV.getContext())) {
auto *RegVar = new DbgVariable( auto *RegVar = new DbgVariable(
DV, findAbstractVariable(DV, Scope->getScopeNode()), this); DV, findAbstractVariable(DV, Scope->getScopeNode()), this);
if (!addCurrentFnArgument(RegVar, Scope))
addScopeVariable(Scope, RegVar); addScopeVariable(Scope, RegVar);
} }
} }
@ -1462,6 +1459,8 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
} }
void DwarfDebug::addScopeVariable(LexicalScope *LS, DbgVariable *Var) { void DwarfDebug::addScopeVariable(LexicalScope *LS, DbgVariable *Var) {
if (addCurrentFnArgument(Var, LS))
return;
SmallVectorImpl<DbgVariable *> &Vars = ScopeVariables[LS]; SmallVectorImpl<DbgVariable *> &Vars = ScopeVariables[LS];
DIVariable DV = Var->getVariable(); DIVariable DV = Var->getVariable();
// Variables with positive arg numbers are parameters. // Variables with positive arg numbers are parameters.