diff options
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/delete.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index 7967c822b3..738aac2595 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -1206,7 +1206,7 @@ static void EmitObjectDelete(CodeGenFunction &CGF, const CXXDestructorDecl *Dtor = 0; if (const RecordType *RT = ElementType->getAs<RecordType>()) { CXXRecordDecl *RD = cast<CXXRecordDecl>(RT->getDecl()); - if (!RD->hasTrivialDestructor()) { + if (RD->hasDefinition() && !RD->hasTrivialDestructor()) { Dtor = RD->getDestructor(); if (Dtor->isVirtual()) { diff --git a/test/CodeGenCXX/delete.cpp b/test/CodeGenCXX/delete.cpp index dbef6a0ebc..8ad76f8532 100644 --- a/test/CodeGenCXX/delete.cpp +++ b/test/CodeGenCXX/delete.cpp @@ -125,9 +125,11 @@ namespace test4 { namespace test5 { struct Incomplete; - // CHECK: define void @_ZN5test523array_delete_incompleteEPNS_10IncompleteE - void array_delete_incomplete(Incomplete *p) { + // CHECK: define void @_ZN5test523array_delete_incompleteEPNS_10IncompleteES1_ + void array_delete_incomplete(Incomplete *p1, Incomplete *p2) { + // CHECK: call void @_ZdlPv + delete p1; // CHECK: call void @_ZdaPv - delete [] p; + delete [] p2; } } |