From c9af8fd76badbe5068404288c9c006d969ec7573 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Fri, 23 Oct 2009 18:08:22 +0000 Subject: 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. llvm-svn: 84955 --- clang/lib/Sema/SemaExprCXX.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'clang/lib/Sema/SemaExprCXX.cpp') diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index d4d031f91ed..ee19ff6b848 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1139,6 +1139,10 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, From = CastArg.takeAs(); 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(), -- cgit v1.2.3