diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-02-06 20:00:21 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-02-06 20:00:21 +0000 |
| commit | 5ade5d39b462f2174f98cb06d7166a058d6d44cd (patch) | |
| tree | 742257798efc501f1e261d3ac15b34b6a4ddfb01 /clang | |
| parent | ba63167b64656e5b019987ded8cd639bbb4c0867 (diff) | |
| download | bcm5719-llvm-5ade5d39b462f2174f98cb06d7166a058d6d44cd.tar.gz bcm5719-llvm-5ade5d39b462f2174f98cb06d7166a058d6d44cd.zip | |
Call destructors for constructed bases as well.
llvm-svn: 95502
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 4ec524da8b5..fb2c9583d4a 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -809,6 +809,19 @@ static void EmitBaseInitializer(CodeGenFunction &CGF, V = CGF.Builder.CreateConstInBoundsGEP1_64(V, Offset/8); V = CGF.Builder.CreateBitCast(V, BaseClassType->getPointerTo()); CGF.EmitAggExpr(BaseInit->getInit(), V, false, false, true); + + if (CGF.Exceptions && !BaseClassDecl->hasTrivialDestructor()) { + // FIXME: Is this OK for C++0x delegating constructors? + CodeGenFunction::EHCleanupBlock Cleanup(CGF); + + llvm::Value *ThisPtr = CGF.LoadCXXThis(); + llvm::Value *V = CGF.Builder.CreateBitCast(ThisPtr, Int8PtrTy); + V = CGF.Builder.CreateConstInBoundsGEP1_64(V, Offset / 8); + V = CGF.Builder.CreateBitCast(V, BaseClassType->getPointerTo()); + + CXXDestructorDecl *DD = BaseClassDecl->getDestructor(CGF.getContext()); + CGF.EmitCXXDestructorCall(DD, Dtor_Base, V); + } } static void EmitMemberInitializer(CodeGenFunction &CGF, |
