Skip to content

Commit 119a902

Browse files
committed
Revert "[CIR][NFC] Add missing code markers for Dtor_VectorDeleting (llvm#167969)"
This reverts commit e6b9805.
1 parent f2cb5d7 commit 119a902

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

clang/lib/CIR/CodeGen/CIRGenExprCXX.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -746,13 +746,6 @@ void CIRGenFunction::emitCXXDeleteExpr(const CXXDeleteExpr *e) {
746746
deleteTy = getContext().getBaseElementType(deleteTy);
747747
ptr = ptr.withElementType(builder, convertTypeForMem(deleteTy));
748748

749-
if (e->isArrayForm() &&
750-
cgm.getASTContext().getTargetInfo().emitVectorDeletingDtors(
751-
cgm.getASTContext().getLangOpts())) {
752-
cgm.errorNYI(e->getSourceRange(),
753-
"emitCXXDeleteExpr: emitVectorDeletingDtors");
754-
}
755-
756749
if (e->isArrayForm()) {
757750
assert(!cir::MissingFeatures::deleteArray());
758751
cgm.errorNYI(e->getSourceRange(), "emitCXXDeleteExpr: array delete");

clang/lib/CIR/CodeGen/CIRGenFunction.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -754,9 +754,7 @@ void CIRGenFunction::emitDestructorBody(FunctionArgList &args) {
754754
// outside of the function-try-block, which means it's always
755755
// possible to delegate the destructor body to the complete
756756
// destructor. Do so.
757-
if (dtorType == Dtor_Deleting || dtorType == Dtor_VectorDeleting) {
758-
if (cxxStructorImplicitParamValue && dtorType == Dtor_VectorDeleting)
759-
cgm.errorNYI(dtor->getSourceRange(), "emitConditionalArrayDtorCall");
757+
if (dtorType == Dtor_Deleting) {
760758
RunCleanupsScope dtorEpilogue(*this);
761759
enterDtorCleanups(dtor, Dtor_Deleting);
762760
if (haveInsertPoint()) {
@@ -789,7 +787,6 @@ void CIRGenFunction::emitDestructorBody(FunctionArgList &args) {
789787
case Dtor_Comdat:
790788
llvm_unreachable("not expecting a COMDAT");
791789
case Dtor_Deleting:
792-
case Dtor_VectorDeleting:
793790
llvm_unreachable("already handled deleting case");
794791

795792
case Dtor_Complete:

0 commit comments

Comments
 (0)