diff options
| -rw-r--r-- | clang/lib/CodeGen/CGCXX.cpp | 11 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/member-function-pointers.cpp | 17 |
2 files changed, 23 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index ff56c8c85a2..3960cf51868 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/lib/CodeGen/CGCXX.cpp @@ -278,10 +278,11 @@ RValue CodeGenFunction::EmitCXXMemberCallExpr(const CXXMemberCallExpr *CE) { RValue CodeGenFunction::EmitCXXMemberPointerCallExpr(const CXXMemberCallExpr *E) { const BinaryOperator *BO = cast<BinaryOperator>(E->getCallee()); - const DeclRefExpr *BaseExpr = cast<DeclRefExpr>(BO->getLHS()); - const DeclRefExpr *MemFn = cast<DeclRefExpr>(BO->getRHS()); + const Expr *BaseExpr = BO->getLHS(); + const Expr *MemFnExpr = BO->getRHS(); - const MemberPointerType *MPT = MemFn->getType()->getAs<MemberPointerType>(); + const MemberPointerType *MPT = + MemFnExpr->getType()->getAs<MemberPointerType>(); const FunctionProtoType *FPT = MPT->getPointeeType()->getAs<FunctionProtoType>(); const CXXRecordDecl *RD = @@ -296,8 +297,8 @@ CodeGenFunction::EmitCXXMemberPointerCallExpr(const CXXMemberCallExpr *E) { // Get the member function pointer. llvm::Value *MemFnPtr = - CreateTempAlloca(ConvertType(MemFn->getType()), "mem.fn"); - EmitAggExpr(MemFn, MemFnPtr, /*VolatileDest=*/false); + CreateTempAlloca(ConvertType(MemFnExpr->getType()), "mem.fn"); + EmitAggExpr(MemFnExpr, MemFnPtr, /*VolatileDest=*/false); // Emit the 'this' pointer. llvm::Value *This; diff --git a/clang/test/CodeGenCXX/member-function-pointers.cpp b/clang/test/CodeGenCXX/member-function-pointers.cpp index 9727a9dabda..13f7de5a631 100644 --- a/clang/test/CodeGenCXX/member-function-pointers.cpp +++ b/clang/test/CodeGenCXX/member-function-pointers.cpp @@ -54,3 +54,20 @@ void f3(A *a, A &ar) { (a->*pa)(); (ar.*pa)(); } + +// PR5177 +namespace PR5177 { + struct A { + bool foo(int*) const; + } a; + + struct B1 { + bool (A::*pmf)(int*) const; + const A* pa; + + B1() : pmf(&A::foo), pa(&a) {} + bool operator()() const { return (pa->*pmf)(new int); } + }; + + void bar(B1 b2) { while (b2()) ; } +} |
