diff options
Diffstat (limited to 'lib/Sema/SemaObjCProperty.cpp')
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index 7f6d8c34f4..42a5c9d0e8 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -279,6 +279,9 @@ Sema::HandlePropertyInClassExtension(Scope *S, if (!Context.hasSameType(PIDecl->getType(), PDecl->getType())) { bool IncompatibleObjC = false; QualType ConvertedType; + // Relax the strict type matching for property type in continuation class. + // Allow property object type of continuation class to be different as long + // as it narrows the object type in its primary class property. if (!isa<ObjCObjectPointerType>(PIDecl->getType()) || !isa<ObjCObjectPointerType>(PDecl->getType()) || (!isObjCPointerConversion(PDecl->getType(), PIDecl->getType(), |