Fix crash on null deference when searching for readwrite properties in
categories.
- Also, simplify nesting via early return.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61968 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/DeclObjC.cpp b/lib/AST/DeclObjC.cpp
index 194544f..cf3bd0a 100644
--- a/lib/AST/DeclObjC.cpp
+++ b/lib/AST/DeclObjC.cpp
@@ -252,24 +252,26 @@
}
}
-/// isPropertyReadonly - Return true if property is a readonly, by seaching
+/// isPropertyReadonly - Return true if property is readonly, by searching
/// for the property in the class and in its categories.
///
bool ObjCInterfaceDecl::isPropertyReadonly(ObjCPropertyDecl *PDecl) const
{
- if (PDecl->isReadOnly()) {
- // Main class has the property as 'readyonly'. Must search
- // through the category list to see if the property's
- // attribute has been over-ridden to 'readwrite'.
- for (ObjCCategoryDecl *Category = getCategoryList();
- Category; Category = Category->getNextClassCategory()) {
- PDecl= Category->FindPropertyDeclaration(PDecl->getIdentifier());
- if (PDecl && !PDecl->isReadOnly())
- return false;
- }
- return true;
+ if (!PDecl->isReadOnly())
+ return false;
+
+ // Main class has the property as 'readonly'. Must search
+ // through the category list to see if the property's
+ // attribute has been over-ridden to 'readwrite'.
+ for (ObjCCategoryDecl *Category = getCategoryList();
+ Category; Category = Category->getNextClassCategory()) {
+ ObjCPropertyDecl *P =
+ Category->FindPropertyDeclaration(PDecl->getIdentifier());
+ if (P && !P->isReadOnly())
+ return false;
}
- return false;
+
+ return true;
}
/// FindPropertyDeclaration - Finds declaration of the property given its name
diff --git a/test/SemaObjC/property-category-1.m b/test/SemaObjC/property-category-1.m
index 32e14f0..926f964 100644
--- a/test/SemaObjC/property-category-1.m
+++ b/test/SemaObjC/property-category-1.m
@@ -33,3 +33,20 @@
return test.object - 12345 + test.Anotherobject - 200;
}
+///
+
+@interface I0
+@property(readonly) int p0;
+@end
+
+@interface I0 (Cat0)
+@end
+
+@interface I0 (Cat1)
+@end
+
+@implementation I0
+- (void) foo {
+ self.p0 = 0; // expected-error {{assigning to property with 'readonly' attribute not allowed}}
+}
+@end