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

[JosephTremoulet]

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.

[JosephTremoulet]

rebase

[rnk]

lgtm

lib/CodeGen/CGCleanup.cpp

void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
   if (RequiresEHCleanup) {
     CGBuilderTy::InsertPoint SavedIP = Builder.saveAndClearIP();
 
     EmitBlock(EHEntry);
     llvm::CleanupPadInst *CPI = nullptr;
     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.
     if (EHActiveFlag || IsActive) {
 
       cleanupFlags.setIsForEHCleanup();
       EmitCleanup(*this, Fn, cleanupFlags, EHActiveFlag);
     }
 
     if (CPI)
-      Builder.CreateCleanupRet(NextAction, CPI);
+      Builder.CreateCleanupRet(CPI, NextAction);
     else
       Builder.CreateBr(NextAction);
 
     Builder.restoreIP(SavedIP);
 
     SimplifyCleanupEntry(*this, EHEntry);
   }
 }

lib/CodeGen/CGException.cpp

if (I + 1 == E) {
       CGBuilderTy(NextBlock).CreateCatchEndPad(
           CGF.getEHDispatchBlock(CatchScope.getEnclosingEHScope()));
     } else {
       NextBlock = CGF.createBasicBlock("catch.dispatch");
     }
 
     if (EHPersonality::get(CGF).isMSVCXXPersonality()) {
       CGF.Builder.CreateCatchPad(
-          llvm::Type::getTokenTy(CGF.getLLVMContext()), Handler.Block,
-          NextBlock, {TypeValue, llvm::Constant::getNullValue(CGF.VoidPtrTy)});
+          Handler.Block, NextBlock,
+          {TypeValue, llvm::Constant::getNullValue(CGF.VoidPtrTy)});
     } else {
-      CGF.Builder.CreateCatchPad(llvm::Type::getTokenTy(CGF.getLLVMContext()),
-                                 Handler.Block, NextBlock, {TypeValue});
+      CGF.Builder.CreateCatchPad(Handler.Block, NextBlock, {TypeValue});
     }
 
     // Otherwise we need to emit and continue at that block.
     CGF.EmitBlock(NextBlock);
   }
   CGF.Builder.restoreIP(SavedIP);
 
   return NextBlock;

lib/CodeGen/MicrosoftCXXABI.cpp

 struct CallEndCatchMSVC final : EHScopeStack::Cleanup {
   llvm::CatchPadInst *CPI;
 
   CallEndCatchMSVC(llvm::CatchPadInst *CPI) : CPI(CPI) {}
 
   void Emit(CodeGenFunction &CGF, Flags flags) override {
     if (CGF.CGM.getCodeGenOpts().NewMSEH) {
       llvm::BasicBlock *BB = CGF.createBasicBlock("catchret.dest");
-      CGF.Builder.CreateCatchRet(BB, CPI);
+      CGF.Builder.CreateCatchRet(CPI, BB);
       CGF.EmitBlock(BB);
     } else {
       CGF.EmitNounwindRuntimeCall(
           CGF.CGM.getIntrinsic(llvm::Intrinsic::eh_endcatch));
     }
   }
 };
 }