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

Revert "PR21408: Workaround the appearance of duplicate variables due to problems when inlining two calls to the same function from the same call site."

Browse Source 
The underlying bug has been fixed in r226736 so there's no need to
workaround this anymore.

This reverts commit r220923.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226842 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie
2015-01-22 17:49:59 +00:00
parent 4bfc1fc49f
commit 2e96653b54
2 changed files with 1 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/CodeGen/AsmPrinter/DwarfFile.cpp
View File

@ -168,12 +168,7 @@ void DwarfFile::addScopeVariable(LexicalScope *LS, DbgVariable *Var) {
// A later indexed parameter has been found, insert immediately before it.
if (CurNum > ArgNum)
break;
// FIXME: There are still some cases where two inlined functions are
// conflated together (two calls to the same function at the same
// location (eg: via a macro, or without column info, etc)) and then
// their arguments are conflated as well.
assert((LS->getParent() || CurNum != ArgNum) &&
"Duplicate argument for top level (non-inlined) function");
assert(CurNum != ArgNum && "Duplicate argument");
++I;
}
Vars.insert(I, Var);