]> granicus.if.org Git - llvm/commit
Merging r321911:
authorHans Wennborg <hans@hanshq.net>
Fri, 9 Feb 2018 10:04:11 +0000 (10:04 +0000)
committerHans Wennborg <hans@hanshq.net>
Fri, 9 Feb 2018 10:04:11 +0000 (10:04 +0000)
commit79e89d39eafeccd3987c93a49015bf280168176d
tree5f9ef6834ad5ed00b602c44a488871281f74e2e7
parent67a35414a65dfba5e7843379eccef49f21fba7b7
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.
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@324723 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp
lib/CodeGen/AsmPrinter/DwarfUnit.cpp
test/DebugInfo/X86/void-typedef.ll [new file with mode: 0644]