Fix <rdar://problem/6578665> user declared setter method should be used when using property syntx.

llvm-svn: 66658

clang/lib/Sema/SemaExpr.cpp

@@ -1883,7 +1883,7 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
       // Check if we can reference this property.
       if (DiagnoseUseOfDecl(Getter, MemberLoc))
         return ExprError();
-
+    }
     // If we found a getter then this may be a valid dot-reference, we
     // will look for the matching setter, in case it is needed.
     Selector SetterSel = 
@@ -1910,11 +1910,20 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
     if (Setter && DiagnoseUseOfDecl(Setter, MemberLoc))
       return ExprError();
 
+    if (Getter || Setter) {
+      QualType PType;
+
+      if (Getter)
+        PType = Getter->getResultType();
+      else {
+        for (ObjCMethodDecl::param_iterator PI = Setter->param_begin(),
+             E = Setter->param_end(); PI != E; ++PI)
+          PType = (*PI)->getType();
+      }
       // FIXME: we must check that the setter has property type.
-      return Owned(new (Context) ObjCKVCRefExpr(Getter, Getter->getResultType(),
+      return Owned(new (Context) ObjCKVCRefExpr(Getter, PType,
                                       Setter, MemberLoc, BaseExpr));
     }
-
     return ExprError(Diag(MemberLoc, diag::err_property_not_found)
       << &Member << BaseType);
   }

clang/test/SemaObjC/property-user-setter.m

@@ -59,3 +59,32 @@
 
 @end
 
+static int g_val;
+
+@interface Root 
++ alloc;
+- init;
+@end
+
+@interface Subclass : Root
+{
+    int setterOnly;
+}
+- (void) setSetterOnly:(int)value;
+@end
+
+@implementation Subclass
+- (void) setSetterOnly:(int)value {
+    setterOnly = value;
+    g_val = setterOnly;
+}
+@end
+
+int main (void) {
+    Subclass *x = [[Subclass alloc] init];
+
+    x.setterOnly = 4;
+    if (g_val != 4)
+      abort ();
+    return 0;
+}