summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2013-10-18 16:56:48 +0000
committerEric Christopher <echristo@gmail.com>2013-10-18 16:56:48 +0000
commit3c58aad3bc10f888c08c82520ea5b6f629fb91ba (patch)
tree6751e34fb3a72127f841832a71e143d99cd47e1e
parent8241242e5070d523b27c4c8f75a93c07c713a2d6 (diff)
downloadllvm-3c58aad3bc10f888c08c82520ea5b6f629fb91ba.tar.gz
llvm-3c58aad3bc10f888c08c82520ea5b6f629fb91ba.tar.bz2
llvm-3c58aad3bc10f888c08c82520ea5b6f629fb91ba.tar.xz
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
-rw-r--r--lib/CodeGen/AsmPrinter/DwarfDebug.cpp6
1 files 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())