diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaObjC/arc-invalid.m | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index 23fa024593f..bc982997411 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -1907,6 +1907,9 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property, ObjCMethodDecl *GetterMethod, *SetterMethod; + if (CD->isInvalidDecl()) + return; + GetterMethod = CD->getInstanceMethod(property->getGetterName()); SetterMethod = CD->getInstanceMethod(property->getSetterName()); DiagnosePropertyAccessorMismatch(property, GetterMethod, diff --git a/clang/test/SemaObjC/arc-invalid.m b/clang/test/SemaObjC/arc-invalid.m index c736ed4a167..07b6480c1f9 100644 --- a/clang/test/SemaObjC/arc-invalid.m +++ b/clang/test/SemaObjC/arc-invalid.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fblocks -verify %s +// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -fblocks -Wno-objc-root-class -verify %s // rdar://problem/10982793 // [p foo] in ARC creates a cleanup. @@ -16,3 +16,29 @@ void test1(void) { __autoreleasing id p; // expected-note {{'p' declared here}} takeBlock(^{ (void) p; }); // expected-error {{cannot capture __autoreleasing variable in a block}} } + +// rdar://17024681 +@class WebFrame; +@interface WebView // expected-note {{previous definition is here}} +- (WebFrame *)mainFrame; +@end + +@interface WebView // expected-error {{duplicate interface definition for class 'WebView'}} +@property (nonatomic, readonly, strong) WebFrame *mainFrame; +@end + +@interface UIWebDocumentView +- (WebView *)webView; +@end + +@interface UIWebBrowserView : UIWebDocumentView +@end + +@interface StoreBanner @end + +@implementation StoreBanner ++ (void)readMetaTagContentForUIWebBrowserView:(UIWebBrowserView *)browserView +{ + [[browserView webView] mainFrame]; +} +@end |
