From: Douglas Gregor Date: Tue, 26 Jul 2011 15:11:03 +0000 (+0000) Subject: When we decide not to rebuild an instantiated C++ 'new' expression X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ad63cf7146268a336b5a931f626adaa8a5150f0;p=clang When we decide not to rebuild an instantiated C++ 'new' expression that allocates an array of objects with a non-trivial destructor, be sure to mark the destructor is "used". Fixes PR10480 / . git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136081 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h index c75665bfc0..2221fc0c21 100644 --- a/lib/Sema/TreeTransform.h +++ b/lib/Sema/TreeTransform.h @@ -6902,6 +6902,19 @@ TreeTransform::TransformCXXNewExpr(CXXNewExpr *E) { SemaRef.MarkDeclarationReferenced(E->getLocStart(), OperatorNew); if (OperatorDelete) SemaRef.MarkDeclarationReferenced(E->getLocStart(), OperatorDelete); + + if (E->isArray() && Constructor && + !E->getAllocatedType()->isDependentType()) { + QualType ElementType + = SemaRef.Context.getBaseElementType(E->getAllocatedType()); + if (const RecordType *RecordT = ElementType->getAs()) { + CXXRecordDecl *Record = cast(RecordT->getDecl()); + if (CXXDestructorDecl *Destructor = SemaRef.LookupDestructor(Record)) { + SemaRef.MarkDeclarationReferenced(E->getLocStart(), Destructor); + } + } + } + return SemaRef.Owned(E); } diff --git a/test/SemaTemplate/instantiate-expr-4.cpp b/test/SemaTemplate/instantiate-expr-4.cpp index 521d2180d7..9483f9b283 100644 --- a/test/SemaTemplate/instantiate-expr-4.cpp +++ b/test/SemaTemplate/instantiate-expr-4.cpp @@ -135,6 +135,23 @@ namespace PR5755 { } } +namespace PR10480 { + template + struct X { + X(); + ~X() { + T *ptr = 1; // expected-error{{cannot initialize a variable of type 'int *' with an rvalue of type 'int'}} + } + }; + + template + void f() { + new X[1]; // expected-note{{in instantiation of member function 'PR10480::X::~X' requested here}} + } + + template void f(); +} + // --------------------------------------------------------------------- // throw expressions // ---------------------------------------------------------------------