1 files changed, 18 insertions, 4 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 835a467fc2..56f08b28d9 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -551,14 +551,28 @@ Expr::isModifiableLvalueResult Expr::isModifiableLvalue(ASTContext &Ctx) const {
   if (getStmtClass() == ObjCPropertyRefExprClass) {
     const ObjCPropertyRefExpr* PropExpr = cast<ObjCPropertyRefExpr>(this);
     if (ObjCPropertyDecl *PDecl = PropExpr->getProperty()) {
-      ObjCPropertyDecl::PropertyAttributeKind Pkind = 
-        PDecl->getPropertyAttributes();
-      if (Pkind == ObjCPropertyDecl::OBJC_PR_readonly)
+      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'.
+        const Expr *BaseExpr = PropExpr->getBase();
+        QualType BaseType = BaseExpr->getType();
+        const PointerType *PTy = BaseType->getAsPointerType();
+        const ObjCInterfaceType *IFTy = 
+          PTy->getPointeeType()->getAsObjCInterfaceType();
+        ObjCInterfaceDecl *IFace = IFTy->getDecl();
+        for (ObjCCategoryDecl *Category = IFace->getCategoryList();
+             Category; Category = Category->getNextClassCategory()) {
+          PDecl= Category->FindPropertyDeclaration(PDecl->getIdentifier());
+          if (PDecl && !PDecl->isReadOnly())
+            return MLV_Valid;
+        }
         return MLV_ReadonlyProperty;
+      }
     }
   }
   // Assigning to an 'implicit' property?
-  if (getStmtClass() == ObjCKVCRefExprClass) {
+  else if (getStmtClass() == ObjCKVCRefExprClass) {
     const ObjCKVCRefExpr* KVCExpr = cast<ObjCKVCRefExpr>(this);
     if (KVCExpr->getSetterMethod() == 0)
       return MLV_NoSetterProperty;