summaryrefslogtreecommitdiffstats
path: root/lib/CodeGen/CGCleanup.cpp
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2015-10-08 01:13:52 +0000
committerReid Kleckner <rnk@google.com>2015-10-08 01:13:52 +0000
commitaf74df2b286de555e2b26dbd3c8d888327a85ffb (patch)
tree38528ddbdb5790ced3330b84297aec9a394cefd7 /lib/CodeGen/CGCleanup.cpp
parenta2ce7ac7a57b3839e3e5a0810fdfc90a73eed964 (diff)
[WinEH] Remove NewMSEH and enable its behavior by default
Testing has shown that it is at least as reliable as the old landingpad pattern matching code. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249647 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGCleanup.cpp')
-rw-r--r--lib/CodeGen/CGCleanup.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCleanup.cpp b/lib/CodeGen/CGCleanup.cpp
index 31c870ff6f..5796320894 100644
--- a/lib/CodeGen/CGCleanup.cpp
+++ b/lib/CodeGen/CGCleanup.cpp
@@ -933,8 +933,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
EmitBlock(EHEntry);
llvm::CleanupPadInst *CPI = nullptr;
llvm::BasicBlock *NextAction = getEHDispatchBlock(EHParent);
- if (CGM.getCodeGenOpts().NewMSEH &&
- EHPersonality::get(*this).isMSVCPersonality())
+ if (EHPersonality::get(*this).usesFuncletPads())
CPI = Builder.CreateCleanupPad({});
// We only actually emit the cleanup code if the cleanup is either