diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 7 | ||||
| -rw-r--r-- | test/SemaObjCXX/overload.mm | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 5fb1b14b98..8365349513 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -767,6 +767,13 @@ bool Sema::IsPointerConversion(Expr *From, QualType FromType, QualType ToType, if (isObjCPointerConversion(FromType, ToType, ConvertedType, IncompatibleObjC)) return true; + // Conversion from a null pointer constant to any Objective-C pointer type. + if (Context.isObjCObjectPointerType(ToType) && + From->isNullPointerConstant(Context)) { + ConvertedType = ToType; + return true; + } + // Blocks: Block pointers can be converted to void*. if (FromType->isBlockPointerType() && ToType->isPointerType() && ToType->getAsPointerType()->getPointeeType()->isVoidType()) { diff --git a/test/SemaObjCXX/overload.mm b/test/SemaObjCXX/overload.mm index badba16c42..397a471257 100644 --- a/test/SemaObjCXX/overload.mm +++ b/test/SemaObjCXX/overload.mm @@ -76,6 +76,9 @@ void qualid_test(A *a, B *b, C *c) { int& i1 = qualid(a); int& i2 = qualid(b); float& f1 = qualid(c); + + id<P0> p1 = 0; + p1 = 0; } |