diff options
| author | Joseph Tremoulet <jotrem@microsoft.com> | 2015-08-23 00:26:48 +0000 |
|---|---|---|
| committer | Joseph Tremoulet <jotrem@microsoft.com> | 2015-08-23 00:26:48 +0000 |
| commit | ce536a596b745c4d2b8ac9b9fcdd91426f8562a8 (patch) | |
| tree | 6a90ce1d4ebe29ea9bf343f739d6b4c9eb1f31e7 /clang/lib/CodeGen/CGException.cpp | |
| parent | 8220bcc5700305452e823ad2d37d769f8f15a497 (diff) | |
| download | bcm5719-llvm-ce536a596b745c4d2b8ac9b9fcdd91426f8562a8.tar.gz bcm5719-llvm-ce536a596b745c4d2b8ac9b9fcdd91426f8562a8.zip | |
[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
Diffstat (limited to 'clang/lib/CodeGen/CGException.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 83285d9ca93..974da245631 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -887,11 +887,10 @@ static llvm::BasicBlock *emitMSVCCatchDispatchBlock(CodeGenFunction &CGF, 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. |
