aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Sema/SemaDeclObjC.cpp16
-rw-r--r--test/SemaObjC/synthesize-setter-contclass.m24
2 files changed, 27 insertions, 13 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 464c78a5df..208562f8f1 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1672,24 +1672,14 @@ Sema::DeclPtrTy Sema::ActOnProperty(Scope *S, SourceLocation AtLoc,
if (Attributes & ObjCDeclSpec::DQ_PR_copy)
PIDecl->setPropertyAttributes(ObjCPropertyDecl::OBJC_PR_copy);
PIDecl->setSetterName(SetterSel);
- // FIXME: use a common routine with addPropertyMethods.
- ObjCMethodDecl *SetterDecl =
- ObjCMethodDecl::Create(Context, AtLoc, AtLoc, SetterSel,
- Context.VoidTy,
- CCPrimary,
- true, false, true,
- ObjCMethodDecl::Required);
- ParmVarDecl *Argument = ParmVarDecl::Create(Context, SetterDecl,
- FD.D.getIdentifierLoc(),
- PropertyId,
- T, VarDecl::None, 0);
- SetterDecl->setMethodParams(&Argument, 1, Context);
- PIDecl->setSetterMethodDecl(SetterDecl);
}
else
Diag(AtLoc, diag::err_use_continuation_class)
<< CCPrimary->getDeclName();
*isOverridingProperty = true;
+ // Make sure setter decl is synthesized, and added to primary
+ // class's list.
+ ProcessPropertyDecl(PIDecl, CCPrimary);
return DeclPtrTy();
}
// No matching property found in the primary class. Just fall thru
diff --git a/test/SemaObjC/synthesize-setter-contclass.m b/test/SemaObjC/synthesize-setter-contclass.m
new file mode 100644
index 0000000000..78490c8db0
--- /dev/null
+++ b/test/SemaObjC/synthesize-setter-contclass.m
@@ -0,0 +1,24 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+@interface TestClass
+{
+ int _isItIsOrIsItAint;
+}
+@property (readonly) int itIsOrItAint;
+-(void) doSomething;
+@end
+
+@interface TestClass()
+@property (readwrite) int itIsOrItAint;
+@end
+
+@implementation TestClass
+@synthesize itIsOrItAint = _isItIsOrIsItAint;
+
+-(void) doSomething
+{
+ int i = [self itIsOrItAint];
+
+ [self setItIsOrItAint:(int)1];
+}
+@end