[llvm-branch-commits] [cfe-branch] r122913 - /cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jan  5 15:50:51 2011
New Revision: 122913

URL: http://llvm.org/viewvc/llvm-project?rev=122913&view=rev
Log:
Fix merge failure in r122857, the patch applied to the wrong branch.

Modified:
    cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp

Modified: cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp?rev=122913&r1=122912&r2=122913&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Sema/SemaDeclObjC.cpp Wed Jan  5 15:50:51 2011
@@ -1538,13 +1538,13 @@
   if (ObjCImplementationDecl *IC=dyn_cast<ObjCImplementationDecl>(ClassDecl)) {
     IC->setAtEndRange(AtEnd);
     if (ObjCInterfaceDecl* IDecl = IC->getClassInterface()) {
-      if (LangOpts.ObjCNonFragileABI2)
+      if (LangOpts.ObjCDefaultSynthProperties &&
+          LangOpts.ObjCNonFragileABI2)
         DefaultSynthesizeProperties(S, IC, IDecl);
       ImplMethodsVsClassMethods(S, IC, IDecl);
       AtomicPropertySetterGetterRules(IC, IDecl);
   
-      if (LangOpts.ObjCDefaultSynthProperties &&
-          LangOpts.ObjCNonFragileABI2)
+      if (LangOpts.ObjCNonFragileABI2)
         while (IDecl->getSuperClass()) {
           DiagnoseDuplicateIvars(IDecl, IDecl->getSuperClass());
           IDecl = IDecl->getSuperClass();