diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-12-21 21:40:41 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-12-21 21:40:41 +0000 |
| commit | cfddf7be7992d386391968db448c3abbdc6e324a (patch) | |
| tree | 2f1301ed3cfd4032720183c1dc88f6d14f5dda52 /lib/Sema/SemaOverload.cpp | |
| parent | ebb1c56a4b7a944921b564025df53505ff886050 (diff) | |
For member pointer conversions potentially involving derived-to-base
conversions, make sure that the (possibly) derived type is complete
before looking for base classes.
Finishes the fix for PR8801.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122363 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaOverload.cpp')
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 6b370fd36a..a39f12603c 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1883,9 +1883,10 @@ bool Sema::IsMemberPointerConversion(Expr *From, QualType FromType, // where D is derived from B (C++ 4.11p2). QualType FromClass(FromTypePtr->getClass(), 0); QualType ToClass(ToTypePtr->getClass(), 0); - // FIXME: What happens when these are dependent? Is this function even called? - if (IsDerivedFrom(ToClass, FromClass)) { + if (!Context.hasSameUnqualifiedType(FromClass, ToClass) && + !RequireCompleteType(From->getLocStart(), ToClass, PDiag()) && + IsDerivedFrom(ToClass, FromClass)) { ConvertedType = Context.getMemberPointerType(FromTypePtr->getPointeeType(), ToClass.getTypePtr()); return true; |