[llvm] r210236 - Revert r210221 again, due to a crash Richard Smith has provided involving self-hosting LLVM with libc++.

[David Blaikie]

Author: dblaikie
Date: Wed Jun  4 21:04:59 2014
New Revision: 210236

URL: http://llvm.org/viewvc/llvm-project?rev=210236&view=rev
Log:
Revert r210221 again, due to a crash Richard Smith has provided involving self-hosting LLVM with libc++.

Test case coming, once I reduce it.

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

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=210236&r1=210235&r2=210236&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Wed Jun  4 21:04:59 2014
@@ -1784,8 +1784,7 @@ std::unique_ptr<DIE> DwarfUnit::construc
   // Define variable debug information entry.
   auto VariableDie = make_unique<DIE>(DV.getTag());
   DbgVariable *AbsVar = DV.getAbstractVariable();
-  if (AbsVar) {
-    assert(AbsVar->getDIE());
+  if (AbsVar && AbsVar->getDIE()) {
     addDIEEntry(*VariableDie, dwarf::DW_AT_abstract_origin, *AbsVar->getDIE());
   } else {
     if (!Name.empty())