[WinEH] Update to new EH pad/ret signatures (with tokens required)

Summary:
The signatures of the methods in LLVM for creating EH pads/rets are changing
to require token arguments on rets and assume token return type on pads.
Update creation code accordingly.

Reviewers: majnemer, rnk

Subscribers: cfe-commits

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

llvm-svn: 245798

1 files changed, 2 insertions, 3 deletions

diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp
index e53793d489b..95d2914df93 100644
--- a/clang/lib/CodeGen/CGCleanup.cpp
+++ b/clang/lib/CodeGen/CGCleanup.cpp
@@ -904,8 +904,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
     llvm::BasicBlock *NextAction = getEHDispatchBlock(EHParent);
     if (CGM.getCodeGenOpts().NewMSEH &&
         EHPersonality::get(*this).isMSVCPersonality())
-      CPI = Builder.CreateCleanupPad(llvm::Type::getTokenTy(getLLVMContext()),
-                                     {});
+      CPI = Builder.CreateCleanupPad({});
 
     // We only actually emit the cleanup code if the cleanup is either
     // active or was used before it was deactivated.
@@ -916,7 +915,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
     }
 
     if (CPI)
-      Builder.CreateCleanupRet(NextAction, CPI);
+      Builder.CreateCleanupRet(CPI, NextAction);
     else
       Builder.CreateBr(NextAction);