diff options
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGenCXX/abstract-class-ctors-dtors.cpp | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index f7f8a1271c..e1463e98ec 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -236,11 +236,7 @@ void CodeGenModule::EmitCXXDestructors(const CXXDestructorDecl *D) { // The destructor used for destructing this as a most-derived class; // call the base destructor and then destructs any virtual bases. - if (!D->getParent()->isAbstract() || D->isVirtual()) { - // We don't need to emit the complete ctor if the class is abstract, - // unless the destructor is virtual and needs to be in the vtable. - EmitGlobal(GlobalDecl(D, Dtor_Complete)); - } + EmitGlobal(GlobalDecl(D, Dtor_Complete)); // The destructor used for destructing this as a base class; ignores // virtual bases. diff --git a/test/CodeGenCXX/abstract-class-ctors-dtors.cpp b/test/CodeGenCXX/abstract-class-ctors-dtors.cpp index e1c1a75e47..012c223155 100644 --- a/test/CodeGenCXX/abstract-class-ctors-dtors.cpp +++ b/test/CodeGenCXX/abstract-class-ctors-dtors.cpp @@ -9,7 +9,7 @@ struct A { // CHECK-NOT: define void @_ZN1AC1Ev // CHECK: define void @_ZN1AC2Ev -// CHECK-NOT: define void @_ZN1AD1Ev +// CHECK: define void @_ZN1AD1Ev // CHECK: define void @_ZN1AD2Ev A::A() { } |