diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2015-08-15 03:21:08 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2015-08-15 03:21:08 +0000 |
| commit | e888a2f655ab28b7395d3184c05784b11dde13aa (patch) | |
| tree | ab1b57ee737d6ebb7e7753c456e6919f20f585b6 /clang/lib/CodeGen/CGException.cpp | |
| parent | ad28aaa131bf066dec0125fb6192648f2d0242a6 (diff) | |
| download | bcm5719-llvm-e888a2f655ab28b7395d3184c05784b11dde13aa.tar.gz bcm5719-llvm-e888a2f655ab28b7395d3184c05784b11dde13aa.zip | |
[MS ABI] Switch catchpad/cleanuppad to use tokens
llvm-svn: 245153
Diffstat (limited to 'clang/lib/CodeGen/CGException.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGException.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGException.cpp b/clang/lib/CodeGen/CGException.cpp index 7f4d1c01a75..d4c52ff87cf 100644 --- a/clang/lib/CodeGen/CGException.cpp +++ b/clang/lib/CodeGen/CGException.cpp @@ -887,11 +887,11 @@ static llvm::BasicBlock *emitMSVCCatchDispatchBlock(CodeGenFunction &CGF, if (EHPersonality::get(CGF).isMSVCXXPersonality()) { CGF.Builder.CreateCatchPad( - CGF.VoidTy, Handler.Block, NextBlock, - {TypeValue, llvm::Constant::getNullValue(CGF.VoidPtrTy)}); + llvm::Type::getTokenTy(CGF.getLLVMContext()), Handler.Block, + NextBlock, {TypeValue, llvm::Constant::getNullValue(CGF.VoidPtrTy)}); } else { - CGF.Builder.CreateCatchPad(CGF.VoidTy, Handler.Block, NextBlock, - {TypeValue}); + CGF.Builder.CreateCatchPad(llvm::Type::getTokenTy(CGF.getLLVMContext()), + Handler.Block, NextBlock, {TypeValue}); } // Otherwise we need to emit and continue at that block. |
