From 129552b3757fa15f5e2f8ead1b1e24684f183574 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Thu, 8 Oct 2015 01:13:52 +0000
Subject: [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.

llvm-svn: 249647
---
 clang/lib/CodeGen/CGCleanup.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'clang/lib/CodeGen/CGCleanup.cpp')

diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp
index 31c870ff6f6..5796320894b 100644
--- a/clang/lib/CodeGen/CGCleanup.cpp
+++ b/clang/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
-- 
cgit v1.2.3