diff options
| -rw-r--r-- | clang/lib/Sema/SemaOverload.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/err_init_conversion_failed.cpp | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp index af7aeae3032..3ea939f4cdc 100644 --- a/clang/lib/Sema/SemaOverload.cpp +++ b/clang/lib/Sema/SemaOverload.cpp @@ -2526,7 +2526,8 @@ void Sema::HandleFunctionTypeMismatch(PartialDiagnostic &PDiag, if (FromType->isMemberPointerType() && ToType->isMemberPointerType()) { const MemberPointerType *FromMember = FromType->getAs<MemberPointerType>(), *ToMember = ToType->getAs<MemberPointerType>(); - if (FromMember->getClass() != ToMember->getClass()) { + if (FromMember->getClass()->getCanonicalTypeInternal() != + ToMember->getClass()->getCanonicalTypeInternal()) { PDiag << ft_different_class << QualType(ToMember->getClass(), 0) << QualType(FromMember->getClass(), 0); return; diff --git a/clang/test/SemaCXX/err_init_conversion_failed.cpp b/clang/test/SemaCXX/err_init_conversion_failed.cpp index 0652e7a9ea6..14d49547438 100644 --- a/clang/test/SemaCXX/err_init_conversion_failed.cpp +++ b/clang/test/SemaCXX/err_init_conversion_failed.cpp @@ -43,3 +43,19 @@ void test14(const float2 in, const float2 out) { const float4 V = (float4){ in, out }; // expected-error@-1{{cannot initialize a compound literal initializer}} } + +namespace template_test { +class S { +public: + void foo(int); +}; + +template <class P> struct S2 { + void (P::*a)(const int &); +}; + +void test_15() { + S2<S> X = {&S::foo}; + // expected-error@-1{{cannot initialize a member subobject of type 'void (template_test::S::*)(const int &)' with an rvalue of type 'void (template_test::S::*)(int)': type mismatch at 1st parameter ('const int &' vs 'int')}} +} +} |
