[llvm] r192985 - Revert the rest of r192749 to bring back the buildbot. These two

[Eric Christopher]

Author: echristo
Date: Fri Oct 18 11:56:48 2013
New Revision: 192985

URL: http://llvm.org/viewvc/llvm-project?rev=192985&view=rev
Log:
Revert the rest of r192749 to bring back the buildbot. These two
error messages should not be able to occur at the same time.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=192985&r1=192984&r2=192985&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Fri Oct 18 11:56:48 2013
@@ -994,8 +994,10 @@ void DwarfDebug::collectDeadVariables()
         // Construct subprogram DIE and add variables DIEs.
         CompileUnit *SPCU = CUMap.lookup(TheCU);
         assert(SPCU && "Unable to find Compile Unit!");
-        DIE *SPDIE = SPCU->getDIE(SP);
-        assert(SPDIE && "Subprogram wasn't created?");
+	// FIXME: See the comment in constructSubprogramDIE about duplicate
+	// subprogram DIEs.
+	constructSubprogramDIE(SPCU, SP);
+	DIE *SPDIE = SPCU->getDIE(SP);
         for (unsigned vi = 0, ve = Variables.getNumElements(); vi != ve; ++vi) {
           DIVariable DV(Variables.getElement(vi));
           if (!DV.isVariable())