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/MicrosoftCXXABI.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/MicrosoftCXXABI.cpp')
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftCXXABI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index 6b36987cd60..6a12cedd1bc 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -859,7 +859,7 @@ struct CallEndCatchMSVC final : EHScopeStack::Cleanup { 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( |
