Fix <rdar://problem/6247781> Parser rejecting properly mismatched properties.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56821 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 4e05a13..bb09230 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1254,14 +1254,14 @@
PropertyId->getName());
return 0;
}
- // Check that type of property and its ivar match.
- if (Context.getCanonicalType(Ivar->getType()) !=
- Context.getCanonicalType(property->getType())) {
+ // Check that type of property and its ivar are type compatible.
+ // A property is allowed to be a sub-class of the instance variable type.
+ if (CheckAssignmentConstraints(property->getType(),
+ Ivar->getType()) != Compatible) {
Diag(PropertyLoc, diag::error_property_ivar_type, property->getName(),
Ivar->getName());
return 0;
}
-
} else if (PropertyIvar) {
// @dynamic
Diag(PropertyLoc, diag::error_dynamic_property_ivar_decl);