maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert Devirtualize destructor of final class. 

This reverts r364100 (git commit 405c2b1622)

llvm-svn: 364359
This commit is contained in:
Rumeet Dhindsa 2019-06-25 22:58:25 +00:00
parent b37f2f3391
commit a1d688dfdd
2 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
clang/lib/CodeGen/CGExprCXX.cpp
View File

@ -1865,33 +1865,9 @@ static void EmitObjectDelete(CodeGenFunction &CGF,
Dtor = RD->getDestructor();
if (Dtor->isVirtual()) {
bool UseVirtualCall = true;
const Expr *Base = DE->getArgument();
if (auto *DevirtualizedDtor =
dyn_cast_or_null<const CXXDestructorDecl>(
Dtor->getDevirtualizedMethod(
Base, CGF.CGM.getLangOpts().AppleKext))) {
UseVirtualCall = false;
const CXXRecordDecl *DevirtualizedClass =
DevirtualizedDtor->getParent();
if (declaresSameEntity(getCXXRecord(Base), DevirtualizedClass)) {
// Devirtualized to the class of the base type (the type of the
// whole expression).
Dtor = DevirtualizedDtor;
} else {
// Devirtualized to some other type. Would need to cast the this
// pointer to that type but we don't have support for that yet, so
// do a virtual call. FIXME: handle the case where it is
// devirtualized to the derived type (the type of the inner
// expression) as in EmitCXXMemberOrOperatorMemberCallExpr.
UseVirtualCall = true;
}
}
if (UseVirtualCall) {
CGF.CGM.getCXXABI().emitVirtualObjectDelete(CGF, DE, Ptr, ElementType,
Dtor);
return;
}
CGF.CGM.getCXXABI().emitVirtualObjectDelete(CGF, DE, Ptr, ElementType,
Dtor);
return;
}
}
}

23
clang/test/CodeGenCXX/devirtualize-dtor-final.cpp
View File

@ -1,23 +0,0 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -std=c++11 %s -emit-llvm -o - | FileCheck %s
namespace Test1 {
struct A { virtual ~A() {} };
struct B final : A {};
struct C : A { virtual ~C() final {} };
struct D { virtual ~D() final = 0; };
// CHECK-LABEL: define void @_ZN5Test13fooEPNS_1BE
void foo(B *b) {
// CHECK: call void @_ZN5Test11BD1Ev
delete b;
}
// CHECK-LABEL: define void @_ZN5Test14foo2EPNS_1CE
void foo2(C *c) {
// CHECK: call void @_ZN5Test11CD1Ev
delete c;
}
// CHECK-LABEL: define void @_ZN5Test14evilEPNS_1DE
void evil(D *p) {
// CHECK-NOT: call void @_ZN5Test11DD1Ev
delete p;
}
}