diff options
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGenCXX/devirtualize-virtual-function-calls.cpp | 18 |
2 files changed, 22 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index f35287d540..372eb5407c 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -240,6 +240,8 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE, MD->isVirtual() && ME->hasQualifier()) Callee = BuildAppleKextVirtualCall(MD, ME->getQualifier(), Ty); + else if (ME->hasQualifier()) + Callee = CGM.GetAddrOfFunction(GlobalDecl(Dtor, Dtor_Complete), Ty); else { const CXXMethodDecl *DM = Dtor->getCorrespondingMethodInClass(MostDerivedClassDecl); @@ -258,6 +260,8 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE, MD->isVirtual() && ME->hasQualifier()) Callee = BuildAppleKextVirtualCall(MD, ME->getQualifier(), Ty); + else if (ME->hasQualifier()) + Callee = CGM.GetAddrOfFunction(MD, Ty); else { const CXXMethodDecl *DerivedMethod = MD->getCorrespondingMethodInClass(MostDerivedClassDecl); diff --git a/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp b/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp index 5eede66cd7..a0b6e8c6bd 100644 --- a/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp +++ b/test/CodeGenCXX/devirtualize-virtual-function-calls.cpp @@ -53,3 +53,21 @@ void f() { B().h().f(); } +namespace test2 { + struct foo { + virtual void f(); + virtual ~foo(); + }; + + struct bar : public foo { + virtual void f(); + virtual ~bar(); + }; + + void f(bar *b) { + // CHECK: call void @_ZN5test23foo1fEv + // CHECK: call void @_ZN5test23fooD1Ev + b->foo::f(); + b->foo::~foo(); + } +} |