[llvm-branch-commits] [llvm-branch] r324723 - Merging r321911:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Feb  9 02:04:11 2018
New Revision: 324723

URL: http://llvm.org/viewvc/llvm-project?rev=324723&view=rev
Log:
Merging r321911:
------------------------------------------------------------------------
r321911 | amccarth | 2018-01-06 00:01:04 +0100 (Sat, 06 Jan 2018) | 9 lines

Re-land "Fix faulty assertion in debug info"

This had been reverted because the new test failed on non-X86 bots.  I moved
the new test to the appropriate subdirectory to correct this.

Differential Revision: https://reviews.llvm.org/D41264
Original submission:  r321122 (which was reverted by r321125)

This reverts commit 3c1639b5703c387a0d8cba2862803b4e68dff436.
------------------------------------------------------------------------

Added:
    llvm/branches/release_60/test/DebugInfo/X86/void-typedef.ll
      - copied unchanged from r321911, llvm/trunk/test/DebugInfo/X86/void-typedef.ll
Modified:
    llvm/branches/release_60/   (props changed)
    llvm/branches/release_60/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
    llvm/branches/release_60/lib/CodeGen/AsmPrinter/DwarfUnit.cpp

Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  9 02:04:11 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324422
+/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321911,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324422

Modified: llvm/branches/release_60/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp?rev=324723&r1=324722&r2=324723&view=diff
==============================================================================
--- llvm/branches/release_60/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp (original)
+++ llvm/branches/release_60/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp Fri Feb  9 02:04:11 2018
@@ -163,7 +163,8 @@ uint64_t DebugHandlerBase::getBaseTypeSi
 
   DIType *BaseType = DDTy->getBaseType().resolve();
 
-  assert(BaseType && "Unexpected invalid base type");
+  if (!BaseType)
+    return 0;
 
   // 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

Modified: llvm/branches/release_60/lib/CodeGen/AsmPrinter/DwarfUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/CodeGen/AsmPrinter/DwarfUnit.cpp?rev=324723&r1=324722&r2=324723&view=diff
==============================================================================
--- llvm/branches/release_60/lib/CodeGen/AsmPrinter/DwarfUnit.cpp (original)
+++ llvm/branches/release_60/lib/CodeGen/AsmPrinter/DwarfUnit.cpp Fri Feb  9 02:04:11 2018
@@ -1391,7 +1391,8 @@ void DwarfUnit::constructMemberDIE(DIE &
   if (!Name.empty())
     addString(MemberDie, dwarf::DW_AT_name, Name);
 
-  addType(MemberDie, resolve(DT->getBaseType()));
+  if (DIType *Resolved = resolve(DT->getBaseType()))
+    addType(MemberDie, Resolved);
 
   addSourceLine(MemberDie, DT);