commit b9204a584c4494d3b057ef4ff8795572023eebbe
author Reid Kleckner <rnk@google.com> Wed Nov 11 23:09:31 2015 +0000
committer Reid Kleckner <rnk@google.com> Wed Nov 11 23:09:31 2015 +0000
tree 9b3da1d20bbaddc98a4a4b2b77eb371f778bb5e5
parent f93fff27f0d4f848e79fd695d126a0abf264d9c4

[WinEH] Don't forward branches across empty EH pad BBs

For really simple SEH catchpads, we tried to forward the invoke unwind
edge across the empty block.

llvm-svn: 252822

llvm/lib/CodeGen/BranchFolding.cpp

diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp
index 6ee9a4b..0b2495c 100644
--- a/llvm/lib/CodeGen/BranchFolding.cpp
+++ b/llvm/lib/CodeGen/BranchFolding.cpp
@@ -1404,7 +1404,7 @@
     // other blocks across it.
     if (CurTBB && CurCond.empty() && !CurFBB &&
         IsBranchOnlyBlock(MBB) && CurTBB != MBB &&
-        !MBB->hasAddressTaken()) {
+        !MBB->hasAddressTaken() && !MBB->isEHPad()) {
       DebugLoc dl = getBranchDebugLoc(*MBB);
       // This block may contain just an unconditional branch.  Because there can
       // be 'non-branch terminators' in the block, try removing the branch and