From 3c58aad3bc10f888c08c82520ea5b6f629fb91ba Mon Sep 17 00:00:00 2001 From: Eric Christopher Date: Fri, 18 Oct 2013 16:56:48 +0000 Subject: Revert the rest of r192749 to bring back the buildbot. These two error messages should not be able to occur at the same time. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192985 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 755f27867e..738b879fce 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -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()) -- cgit v1.2.3