Objective-C. Redo turning off designated initialization warnings on

'init' methods which are unavailable. Subclasses of NSObject
have to implement such methods as a common pattern to prevent
user's own implementation. // rdar://16305460

llvm-svn: 203984

1 files changed, 2 insertions, 5 deletions

diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index ca4d20c0994..3198b01949d 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -392,14 +392,11 @@ void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, Decl *D) {
     if (MDecl->getMethodFamily() == OMF_init) {
       if (MDecl->isDesignatedInitializerForTheInterface()) {
         getCurFunction()->ObjCIsDesignatedInit = true;
-        // Don't issue this warning for unavaialable inits.
-        if (!MDecl->isUnavailable())
-          getCurFunction()->ObjCWarnForNoDesignatedInitChain =
+        getCurFunction()->ObjCWarnForNoDesignatedInitChain =
             IC->getSuperClass() != 0;
       } else if (IC->hasDesignatedInitializers()) {
         getCurFunction()->ObjCIsSecondaryInit = true;
-        // Don't issue this warning for unavaialable inits.
-        getCurFunction()->ObjCWarnForNoInitDelegation = !MDecl->isUnavailable();
+        getCurFunction()->ObjCWarnForNoInitDelegation = true;
       }
     }