diff options
author | Reid Kleckner <rnk@google.com> | 2015-11-11 23:09:31 +0000 |
---|---|---|
committer | Reid Kleckner <rnk@google.com> | 2015-11-11 23:09:31 +0000 |
commit | b9204a584c4494d3b057ef4ff8795572023eebbe (patch) | |
tree | 9b3da1d20bbaddc98a4a4b2b77eb371f778bb5e5 /llvm/lib/CodeGen/BranchFolding.cpp | |
parent | f93fff27f0d4f848e79fd695d126a0abf264d9c4 (diff) | |
download | bcm5719-llvm-b9204a584c4494d3b057ef4ff8795572023eebbe.tar.gz bcm5719-llvm-b9204a584c4494d3b057ef4ff8795572023eebbe.zip |
[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
Diffstat (limited to 'llvm/lib/CodeGen/BranchFolding.cpp')
-rw-r--r-- | llvm/lib/CodeGen/BranchFolding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp index 6ee9a4b16fe..0b2495cc996 100644 --- a/llvm/lib/CodeGen/BranchFolding.cpp +++ b/llvm/lib/CodeGen/BranchFolding.cpp @@ -1404,7 +1404,7 @@ ReoptimizeBlock: // 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 |