Fixed a code gen bug (by fixing the AST) involving user-defined

pointer-to-member type conversion follwed by a pointer-to-member
standard conversion.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84955 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index d4d031f91ed56cef016f96d9d34eb1e0c7ac4581..ee19ff6b84863f96b85603d1064183357a2b6459 100644 (file)
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1139,6 +1139,10 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
         From = CastArg.takeAs<Expr>();
         return BuildCXXDerivedToBaseExpr(From, CastKind, ICS, Flavor);
       }
+    
+      if (ICS.UserDefined.After.Second == ICK_Pointer_Member &&
+          ToType.getNonReferenceType()->isMemberFunctionPointerType())
+        CastKind = CastExpr::CK_BaseToDerivedMemberPointer;
       
       From = new (Context) ImplicitCastExpr(ToType.getNonReferenceType(),
                                             CastKind, CastArg.takeAs<Expr>(),

diff --git a/test/CodeGenCXX/ptr-to-member-function.cpp b/test/CodeGenCXX/ptr-to-member-function.cpp
new file mode 100644 (file)
index 0000000..1e396e9
--- /dev/null
+++ b/test/CodeGenCXX/ptr-to-member-function.cpp
@@ -0,0 +1,53 @@
+// RUN: clang-cc -triple x86_64-apple-darwin -std=c++0x -S %s -o %t-64.s &&
+// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s &&
+// RUN: clang-cc -triple i386-apple-darwin -std=c++0x -S %s -o %t-32.s &&
+// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
+// RUN: true
+// 13.3.3.2 Ranking implicit conversion sequences
+
+extern "C" int printf(...);
+
+struct A {
+int Ai;
+}; 
+
+struct B : public A {
+  void bf() { printf("B::bf called\n"); }
+}; 
+
+struct C : public B { }; 
+
+// conversion of B::* to C::* is better than conversion of A::* to C::*
+typedef void (A::*pmfa)();
+typedef void (B::*pmfb)();
+typedef void (C::*pmfc)();
+
+struct X {
+       operator pmfa();
+       operator pmfb() {
+         return &B::bf;
+        }
+};
+
+
+void g(pmfc pm) {
+  C c;
+  (c.*pm)();
+}
+
+void test2(X x) 
+{
+    g(x);
+}
+
+int main()
+{
+       X x;
+       test2(x);
+}
+
+// CHECK-LP64: call    __ZN1XcvM1BFvvEEv
+// CHECK-LP64: call    __Z1gM1CFvvE
+
+// CHECK-LP32: call    L__ZN1XcvM1BFvvEEv
+// CHECK-LP32: call    __Z1gM1CFvvE