Don't assume that the LHS and RHS of a member pointer expression is a DeclRefExpr...

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 ff56c8c85a2780eb8b4a9037d769d1658e8e1e3f..3960cf51868f86dca9b1a559d06313c0555a9c69 100644 (file)
--- a/lib/CodeGen/CGCXX.cpp
+++ b/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/test/CodeGenCXX/member-function-pointers.cpp b/test/CodeGenCXX/member-function-pointers.cpp
index 9727a9dabdad72f713c1408bb6fa22b00a87629f..13f7de5a631bc71f91e3cdba664fbf0bc3bde1f3 100644 (file)
--- a/test/CodeGenCXX/member-function-pointers.cpp
+++ b/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()) ; }
+}