diff options
| -rw-r--r-- | lib/Sema/SemaOverload.cpp | 5 | ||||
| -rw-r--r-- | test/SemaObjCXX/overload.mm | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp index 8319996727..0ff8dc4ace 100644 --- a/lib/Sema/SemaOverload.cpp +++ b/lib/Sema/SemaOverload.cpp @@ -1365,6 +1365,11 @@ BuildSimilarlyQualifiedPointerType(const Type *FromPtr, assert((FromPtr->getTypeClass() == Type::Pointer || FromPtr->getTypeClass() == Type::ObjCObjectPointer) && "Invalid similarly-qualified pointer type"); + + /// \brief Conversions to 'id' subsume cv-qualifier conversions. + if (ToType->isObjCIdType() || ToType->isObjCQualifiedIdType()) + return ToType.getUnqualifiedType(); + QualType CanonFromPointee = Context.getCanonicalType(FromPtr->getPointeeType()); QualType CanonToPointee = Context.getCanonicalType(ToPointee); diff --git a/test/SemaObjCXX/overload.mm b/test/SemaObjCXX/overload.mm index 7000e54cfe..750b6b183a 100644 --- a/test/SemaObjCXX/overload.mm +++ b/test/SemaObjCXX/overload.mm @@ -142,3 +142,12 @@ namespace rdar8714395 { } + +namespace rdar8734046 { + void f1(id); + void f2(id<P0>); + void g(const A *a) { + f1(a); + f2(a); + } +} |