From a0b025e40f94ceffcc8f197d9c15d0f5ade65d96 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 5 Jan 2010 05:04:05 +0000 Subject: When emitting member function pointers, use the canonical decl if the member function is virtual. Fixes PR5940. llvm-svn: 92680 --- clang/lib/CodeGen/CGExprAgg.cpp | 3 ++- clang/lib/CodeGen/CGExprConstant.cpp | 2 ++ clang/test/CodeGenCXX/member-function-pointers.cpp | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp index b95fd799010..c852d65b859 100644 --- a/clang/lib/CodeGen/CGExprAgg.cpp +++ b/clang/lib/CodeGen/CGExprAgg.cpp @@ -313,7 +313,8 @@ void AggExprEmitter::VisitUnaryAddrOf(const UnaryOperator *E) { "Unexpected member pointer type!"); const DeclRefExpr *DRE = cast(E->getSubExpr()); - const CXXMethodDecl *MD = cast(DRE->getDecl()); + const CXXMethodDecl *MD = + cast(DRE->getDecl())->getCanonicalDecl(); const llvm::Type *PtrDiffTy = CGF.ConvertType(CGF.getContext().getPointerDiffType()); diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp index 3236d3950e5..d1330e066de 100644 --- a/clang/lib/CodeGen/CGExprConstant.cpp +++ b/clang/lib/CodeGen/CGExprConstant.cpp @@ -408,6 +408,8 @@ public: llvm::Constant *EmitMemberFunctionPointer(CXXMethodDecl *MD) { assert(MD->isInstance() && "Member function must not be static!"); + MD = MD->getCanonicalDecl(); + const llvm::Type *PtrDiffTy = CGM.getTypes().ConvertType(CGM.getContext().getPointerDiffType()); diff --git a/clang/test/CodeGenCXX/member-function-pointers.cpp b/clang/test/CodeGenCXX/member-function-pointers.cpp index 149b5603ad7..2454ddab774 100644 --- a/clang/test/CodeGenCXX/member-function-pointers.cpp +++ b/clang/test/CodeGenCXX/member-function-pointers.cpp @@ -128,3 +128,14 @@ namespace BoolMemberPointer { } } +// PR5940 +namespace PR5940 { + class foo { + public: + virtual void baz(void); + }; + + void foo::baz(void) { + void (foo::*ptr)(void) = &foo::baz; + } +} -- cgit v1.2.3