More __unknown_anytype work.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@129269 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 65aa46f..f2ab0a2 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -1128,6 +1128,19 @@
   }
 
   case CK_ResolveUnknownAnyType:
+    // Special case: resolving a member pointer constant.
+    if (const UnaryOperator *uo = dyn_cast<UnaryOperator>(E)) {
+      DeclRefExpr *declRef = cast<DeclRefExpr>(uo->getSubExpr());
+      const CXXMethodDecl *method = cast<CXXMethodDecl>(declRef->getDecl());
+
+      const MemberPointerType *mpt = CE->getType()->castAs<MemberPointerType>();
+      QualType resolvedType = mpt->getPointeeType();
+
+      return CGF.CGM.getCXXABI().EmitMemberPointer(method, resolvedType);
+    }
+    // fallthrough
+
+  case CK_ResolveUnknownAnyTypeToReference:
     return EmitLoadOfLValue(CE);
       
   case CK_LValueToRValue: