diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 3 | ||||
| -rw-r--r-- | test/SemaCXX/builtin-ptrtomember-overload.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index d637ed51b1..e7cd4fb575 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -3029,9 +3029,8 @@ BuiltinCandidateTypeSet::AddTypesConvertedFrom(QualType Ty, } CXXRecordDecl *ClassDecl = cast<CXXRecordDecl>(TyRec->getDecl()); - // FIXME: Visit conversion functions in the base classes, too. OverloadedFunctionDecl *Conversions - = ClassDecl->getConversionFunctions(); + = ClassDecl->getVisibleConversionFunctions(); for (OverloadedFunctionDecl::function_iterator Func = Conversions->function_begin(); Func != Conversions->function_end(); ++Func) { diff --git a/test/SemaCXX/builtin-ptrtomember-overload.cpp b/test/SemaCXX/builtin-ptrtomember-overload.cpp index 8c6fb39735..718e981805 100644 --- a/test/SemaCXX/builtin-ptrtomember-overload.cpp +++ b/test/SemaCXX/builtin-ptrtomember-overload.cpp @@ -12,8 +12,7 @@ struct C : B { void foo(C c, B b, int A::* pmf) { - // FIXME. Bug or correct? gcc accepts it. It requires derived-to-base followed by user defined conversion to work. - int j = c->*pmf; // expected-error {{left hand operand to ->* must be a pointer to class compatible with the right hand operand, but is 'struct C'}} + int j = c->*pmf; int i = b->*pmf; } |