summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2015-03-11 16:59:48 +0000
committerFariborz Jahanian <fjahanian@apple.com>2015-03-11 16:59:48 +0000
commit20cfff3d31acbc9b25dae4c2f33f0e12a3273003 (patch)
tree3eca57078ee4e1dbdcf42b65c377b2ee462e3090 /clang/lib/Sema/SemaDeclObjC.cpp
parent4fa0305b72255d452014c0cfec7c3a2ccd53e507 (diff)
downloadbcm5719-llvm-20cfff3d31acbc9b25dae4c2f33f0e12a3273003.tar.gz
bcm5719-llvm-20cfff3d31acbc9b25dae4c2f33f0e12a3273003.zip
revert r231700 (designated initializer patch) which broke
several projects. rdar://20120666. llvm-svn: 231939
Diffstat (limited to 'clang/lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclObjC.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index d958db582af..33d9e95f27f 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -2715,9 +2715,8 @@ Decl *Sema::ActOnAtEnd(Scope *S, SourceRange AtEnd, ArrayRef<Decl *> allMethods,
AtomicPropertySetterGetterRules(IC, IDecl);
DiagnoseOwningPropertyGetterSynthesis(IC);
DiagnoseUnusedBackingIvarInAccessor(S, IC);
- if (IDecl->hasDesignatedInitializers() ||
- IDecl->hasDesignatedInitializersInSuperClass())
- DiagnoseMissingDesignatedInitOverrides(IC);
+ if (IDecl->hasDesignatedInitializers())
+ DiagnoseMissingDesignatedInitOverrides(IC, IDecl);
bool HasRootClassAttr = IDecl->hasAttr<ObjCRootClassAttr>();
if (IDecl->getSuperClass() == nullptr) {
OpenPOWER on IntegriCloud