diff options
| -rw-r--r-- | clang/lib/AST/DeclObjC.cpp | 16 | ||||
| -rw-r--r-- | clang/test/SemaObjC/attr-designated-init.m | 10 |
2 files changed, 22 insertions, 4 deletions
diff --git a/clang/lib/AST/DeclObjC.cpp b/clang/lib/AST/DeclObjC.cpp index b76fc5cf38a..094110fecf8 100644 --- a/clang/lib/AST/DeclObjC.cpp +++ b/clang/lib/AST/DeclObjC.cpp @@ -415,7 +415,9 @@ bool ObjCInterfaceDecl::inheritsDesignatedInitializers() const { void ObjCInterfaceDecl::getDesignatedInitializers( llvm::SmallVectorImpl<const ObjCMethodDecl *> &Methods) const { - assert(hasDefinition()); + // Check for a complete definition and recover if not so. + if (!isThisDeclarationADefinition()) + return; if (data().ExternallyCompleted) LoadExternalDefinition(); @@ -433,7 +435,9 @@ void ObjCInterfaceDecl::getDesignatedInitializers( bool ObjCInterfaceDecl::isDesignatedInitializer(Selector Sel, const ObjCMethodDecl **InitMethod) const { - assert(hasDefinition()); + // Check for a complete definition and recover if not so. + if (!isThisDeclarationADefinition()) + return false; if (data().ExternallyCompleted) LoadExternalDefinition(); @@ -1197,12 +1201,16 @@ void ObjCInterfaceDecl::setExternallyCompleted() { } void ObjCInterfaceDecl::setHasDesignatedInitializers() { - assert(hasDefinition() && "Forward declarations can't contain methods"); + // Check for a complete definition and recover if not so. + if (!isThisDeclarationADefinition()) + return; data().HasDesignatedInitializers = true; } bool ObjCInterfaceDecl::hasDesignatedInitializers() const { - assert(hasDefinition() && "Forward declarations can't contain methods"); + // Check for a complete definition and recover if not so. + if (!isThisDeclarationADefinition()) + return false; if (data().ExternallyCompleted) LoadExternalDefinition(); diff --git a/clang/test/SemaObjC/attr-designated-init.m b/clang/test/SemaObjC/attr-designated-init.m index 0432a1859bb..d24c9c65cbb 100644 --- a/clang/test/SemaObjC/attr-designated-init.m +++ b/clang/test/SemaObjC/attr-designated-init.m @@ -238,3 +238,13 @@ __attribute__((objc_root_class)) return 0; } @end + +// rdar://16261494 +@class GEOPDAnalyticMetadata; // expected-note {{forward declaration of class here}} + +@implementation GEOPDAnalyticMetadata (PlaceCardExtras) // expected-error {{cannot find interface declaration for 'GEOPDAnalyticMetadata'}} +- (instancetype)initInProcess +{ + return ((void*)0); +} +@end |
