Don't assume that the LHS and RHS of a member pointer expression is a DeclRefExpr. Fixes PR5177.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83986 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index ff56c8c..3960cf5 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -278,10 +278,11 @@
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 @@
// 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/test/CodeGenCXX/member-function-pointers.cpp b/test/CodeGenCXX/member-function-pointers.cpp
index 9727a9d..13f7de5 100644
--- a/test/CodeGenCXX/member-function-pointers.cpp
+++ b/test/CodeGenCXX/member-function-pointers.cpp
@@ -54,3 +54,20 @@
(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()) ; }
+}