Merging r260733:
authorDavid Majnemer <david.majnemer@gmail.com>
Wed, 17 Feb 2016 18:41:08 +0000 (18:41 +0000)
committerDavid Majnemer <david.majnemer@gmail.com>
Wed, 17 Feb 2016 18:41:08 +0000 (18:41 +0000)
commitfde3338c42eb085f169ecc3817c4736075e4a683
tree4ca9f45778afce3c0702c77e052b1f56797d2ba0
parent2507c58ca21ee01c359cd5ddf2fe84eea16366ee
Merging r260733:
------------------------------------------------------------------------
r260733 | akaylor | 2016-02-12 13:10:16 -0800 (Fri, 12 Feb 2016) | 5 lines

[WinEH] Prevent EH state numbering from skipping nested cleanup pads that never return

Differential Revision: http://reviews.llvm.org/D17208

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_38@261124 91177308-0d34-0410-b5e6-96231b3b80d8
lib/CodeGen/WinEHPrepare.cpp
test/CodeGen/WinEH/wineh-noret-cleanup.ll [new file with mode: 0644]