diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-12-06 22:09:19 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-12-06 22:09:19 +0000 |
| commit | 143c7acef37824bca93c34d4b1d07c4560ce49a6 (patch) | |
| tree | 14ae328bb456402d113ed3697721da4ddf6c2265 | |
| parent | 409fa9ab9579de04c5d68fb6a6a8d094545b1e77 (diff) | |
Objective-C pointer conversions to 'id' or qualified 'id' subsume
cv-qualification conversions. More specifically, there's an implicit
cv-qualification conversion (even one that drops qualifiers) when
converting to 'id' or qualified 'id'. Fixes <rdar://problem/8734046>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@121047 91177308-0d34-0410-b5e6-96231b3b80d8
| -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); + } +} |