Revert "PR21408: Workaround the appearance of duplicate variables due to problems...

[oota-llvm.git] / lib / CodeGen / AsmPrinter / DwarfFile.cpp

diff --git a/lib/CodeGen/AsmPrinter/DwarfFile.cpp b/lib/CodeGen/AsmPrinter/DwarfFile.cpp
index 549abf88324b1f59f280a67d7265f3570842909e..408f683301d0b03b53106cadd804793258d24154 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfFile.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfFile.cpp
@@ -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);