commit c286f3835eb6001c61664cef5d610dfaf80a6e9b
author Fariborz Jahanian <fjahanian@apple.com> Tue Jul 12 22:05:16 2011 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Tue Jul 12 22:05:16 2011 +0000
tree e85d8866baac3af7dbab9fb66fbcc6b6059e57a3
parent c51af6ce4c609bc3181ad8c28bad8af168db49db

objc++: Some level of covariance is allowed in ObjC properties.
Make it also available in ObjC++ propeties. // rdar://9740328


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135001 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index c830c3e..27f25c2 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -909,7 +909,7 @@
   QualType RHSType =
     Context.getCanonicalType(Property->getType());
 
-  if (!Context.typesAreCompatible(LHSType, RHSType)) {
+  if (!Context.propertyTypesAreCompatible(LHSType, RHSType)) {
     // FIXME: Incorporate this test with typesAreCompatible.
     if (LHSType->isObjCQualifiedIdType() && RHSType->isObjCQualifiedIdType())
       if (Context.ObjCQualifiedIdTypesAreCompatible(LHSType, RHSType, false))