[PATCH Sema Objective-C]. Patch to warn on missing designated initializer

override where at least a declaration of a designated initializer is in a super
class and not necessarily in the current class. rdar://19653785.

llvm-svn: 231700

1 files changed, 5 insertions, 3 deletions

diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp
index f4f43360f5e..716fb50ea69 100644
--- a/clang/lib/Sema/SemaObjCProperty.cpp
+++ b/clang/lib/Sema/SemaObjCProperty.cpp
@@ -1894,9 +1894,11 @@ void Sema::DiagnoseOwningPropertyGetterSynthesis(const ObjCImplementationDecl *D
 }
 
 void Sema::DiagnoseMissingDesignatedInitOverrides(
-                                            const ObjCImplementationDecl *ImplD,
-                                            const ObjCInterfaceDecl *IFD) {
-  assert(IFD->hasDesignatedInitializers());
+                                            const ObjCImplementationDecl *ImplD) {
+  const ObjCInterfaceDecl *IFD = ImplD->getClassInterface();
+  assert(IFD);
+  assert(IFD->hasDesignatedInitializers() ||
+         IFD->hasDesignatedInitializersInSuperClass());
   const ObjCInterfaceDecl *SuperD = IFD->getSuperClass();
   if (!SuperD)
     return;