diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/DeclCXX.cpp | 10 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index f653943f1d..9bdf07b29e 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -409,17 +409,25 @@ CXXDestructorDecl::Create(ASTContext &C, CXXRecordDecl *RD, void CXXConstructorDecl::setBaseOrMemberInitializers( + ASTContext &C, CXXBaseOrMemberInitializer **Initializers, unsigned NumInitializers) { if (NumInitializers > 0) { NumBaseOrMemberInitializers = NumInitializers; BaseOrMemberInitializers = - new CXXBaseOrMemberInitializer*[NumInitializers]; + new (C, 8) CXXBaseOrMemberInitializer*[NumInitializers]; for (unsigned Idx = 0; Idx < NumInitializers; ++Idx) BaseOrMemberInitializers[Idx] = Initializers[Idx]; } } +void +CXXConstructorDecl::Destroy(ASTContext& C) { + C.Deallocate(BaseOrMemberInitializers); + this->~CXXMethodDecl(); + C.Deallocate((void *)this); +} + CXXConversionDecl * CXXConversionDecl::Create(ASTContext &C, CXXRecordDecl *RD, SourceLocation L, DeclarationName N, diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index bbb173a02a..bef63a16d6 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -782,7 +782,7 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl, return; } llvm::DenseMap<void*, CXXBaseOrMemberInitializer *>Members; - + bool err = false; for (unsigned i = 0; i < NumMemInits; i++) { CXXBaseOrMemberInitializer *Member = static_cast<CXXBaseOrMemberInitializer*>(MemInits[i]); @@ -811,7 +811,12 @@ void Sema::ActOnMemInitializers(DeclPtrTy ConstructorDecl, } Diag(PrevMember->getSourceLocation(), diag::note_previous_initializer) << 0; + err = true; } + if (!err) + Constructor->setBaseOrMemberInitializers(Context, + reinterpret_cast<CXXBaseOrMemberInitializer **>(MemInits), + NumMemInits); } namespace { |