diff options
| author | Mike Stump <mrs@apple.com> | 2009-12-04 19:03:47 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-12-04 19:03:47 +0000 |
| commit | a086783570f76062a345e761811296dc8df571c8 (patch) | |
| tree | e30d376a0fc3248d3b0bf7da131fbf5d389d9bb4 /lib/CodeGen/CGException.cpp | |
| parent | ac3f7bdb26c0229baa5ba8a6c68e63f73e39700f (diff) | |
Fix warning and be sure to set up the rethrow pointer if we fall off
the end of all the catches.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90574 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGException.cpp')
| -rw-r--r-- | lib/CodeGen/CGException.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp index 2374d91a2b..3de300445c 100644 --- a/lib/CodeGen/CGException.cpp +++ b/lib/CodeGen/CGException.cpp @@ -138,7 +138,7 @@ static void CopyObject(CodeGenFunction &CGF, const Expr *E, llvm::Value *N) { // CodeGenFunction::CleanupScope TryScope(CGF); { // These actions are only on the exceptional edge. -#if 0 + if (0) { // FIXME: Doesn't work well with eh31.C and PopCXXTemporary CodeGenFunction::DelayedCleanupBlock Scope(CGF, true); @@ -147,7 +147,7 @@ static void CopyObject(CodeGenFunction &CGF, const Expr *E, llvm::Value *N) { = llvm::Type::getInt8PtrTy(CGF.getLLVMContext()); llvm::Value *ExceptionPtr = CGF.Builder.CreateBitCast(N, Int8PtrTy); CGF.Builder.CreateCall(FreeExceptionFn, ExceptionPtr); -#endif + } } llvm::Value *Src = CGF.EmitLValue(E).getAddress(); @@ -461,8 +461,10 @@ void CodeGenFunction::EmitCXXTryStmt(const CXXTryStmt &S) { if (Next) EmitBlock(Next); } - if (!HasCatchAll) + if (!HasCatchAll) { + Builder.CreateStore(Exc, RethrowPtr); EmitBranchThroughCleanup(FinallyRethrow); + } CodeGenFunction::CleanupBlockInfo Info = PopCleanupBlock(); |