diff options
author | Jordan Rupprecht <rupprecht@google.com> | 2019-07-12 00:32:08 +0000 |
---|---|---|
committer | Jordan Rupprecht <rupprecht@google.com> | 2019-07-12 00:32:08 +0000 |
commit | babe09ed9bc28636339b23218e6a5455944ce758 (patch) | |
tree | 5264b21fa073a22d4dfa7d43971fd7606846ada1 /clang/lib/CodeGen | |
parent | 3aba8296e595629b74699d1873cef8f363de5f63 (diff) | |
download | bcm5719-llvm-babe09ed9bc28636339b23218e6a5455944ce758.tar.gz bcm5719-llvm-babe09ed9bc28636339b23218e6a5455944ce758.zip |
Re-Revert Devirtualize destructor of final class.
This reverts r365509 (git commit d088720edad9c29ee0d622b5d69092e18a9ac0bd)
This is a second revert[1] due to failures in internal test cases (shared offline) found during more thorough testing.
[1] Original patch commited as r364100, reverted as r364359, recommitted as r365509
llvm-svn: 365850
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r-- | clang/lib/CodeGen/CGExprCXX.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp index fdca7699888..25b0abbc030 100644 --- a/clang/lib/CodeGen/CGExprCXX.cpp +++ b/clang/lib/CodeGen/CGExprCXX.cpp @@ -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; } } } |