commit 86795d9166bd6fd18cf06aaedc5a487944394e16
author Adrian McCarthy <amccarth@google.com> Tue Dec 19 23:34:37 2017 +0000
committer Adrian McCarthy <amccarth@google.com> Tue Dec 19 23:34:37 2017 +0000
tree 9f1696f4685f52aef5765f3c221c2e0f71c6ccfb
parent 22c651c5770572641eaa16423b19e867f5f61d6b

Revert "Fix faulty assertion in debug info"

This reverts commit e32def3f7ebe1136b7038336eff56a415a962bf2.

llvm-svn: 321125

llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
index 2e5c224..d94b0e5 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
@@ -163,8 +163,7 @@
 
   DIType *BaseType = DDTy->getBaseType().resolve();
 
-  if (!BaseType)
-    return 0;
+  assert(BaseType && "Unexpected invalid base type");
 
   // If this is a derived type, go ahead and get the base type, unless it's a
   // reference then it's just the size of the field. Pointer types have no need

llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
index 4ea59f5..911e462 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
@@ -1391,8 +1391,7 @@
   if (!Name.empty())
     addString(MemberDie, dwarf::DW_AT_name, Name);
 
-  if (DIType *Resolved = resolve(DT->getBaseType()))
-    addType(MemberDie, Resolved);
+  addType(MemberDie, resolve(DT->getBaseType()));
 
   addSourceLine(MemberDie, DT);