commit d3635b9681daaef74974932f77080910b032b9fd
author Fariborz Jahanian <fjahanian@apple.com> Wed Jul 14 18:11:52 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Wed Jul 14 18:11:52 2010 +0000
tree 60616801d949e2edcde30026d5d80f2722981be3
parent 7e9ad8b4fd446ca7cc0e630edee56d8fcc4553de

Don't error when doing default property synthesis 
and some are already synthesized by user declaration.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108341 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index b2b6e13..ff60599 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -930,6 +930,10 @@
         Prop->getPropertyImplementation() == ObjCPropertyDecl::Optional ||
         IMPDecl->FindPropertyImplIvarDecl(Prop->getIdentifier()))
       continue;
+    // Property may have been synthesized by user.
+    if (IMPDecl->FindPropertyImplDecl(Prop->getIdentifier()))
+      continue;
+
     ActOnPropertyImplDecl(S, IMPDecl->getLocation(), IMPDecl->getLocation(),
                           true, DeclPtrTy::make(IMPDecl),
                           Prop->getIdentifier(), Prop->getIdentifier());