diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 5 | ||||
| -rw-r--r-- | test/SemaObjC/property-lookup-in-id.m | 33 |
2 files changed, 36 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index d0528b1bc3..7ef3348bdc 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -3905,8 +3905,9 @@ Sema::LookupMemberExpr(LookupResult &R, Expr *&BaseExpr, MemberLoc, BaseExpr)); } } - - if (ShouldTryAgainWithRedefinitionType(*this, BaseExpr)) + // Use of id.member can only be for a property reference. Do not + // use the 'id' redefinition in this case. + if (IsArrow && ShouldTryAgainWithRedefinitionType(*this, BaseExpr)) return LookupMemberExpr(R, BaseExpr, IsArrow, OpLoc, SS, ObjCImpDecl, HasTemplateArgs); diff --git a/test/SemaObjC/property-lookup-in-id.m b/test/SemaObjC/property-lookup-in-id.m new file mode 100644 index 0000000000..389e0bdba7 --- /dev/null +++ b/test/SemaObjC/property-lookup-in-id.m @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -fsyntax-only -verify %s +// rdar://9106929 + +typedef struct objc_class *Class; + +typedef struct objc_object { + Class isa; +} *id; + + +typedef struct __FSEventStream* FSEventStreamRef; + +extern id NSApp; + +@interface FileSystemMonitor { + + FSEventStreamRef fsEventStream; +} +@property(assign) FSEventStreamRef fsEventStream; + +@end + +@implementation FileSystemMonitor +@synthesize fsEventStream; + +- (void)startFSEventGathering:(id)sender +{ + fsEventStream = [NSApp delegate].fsEventStream; // expected-warning {{warning: method '-delegate' not found (return type defaults to 'id')}} \ + // expected-error {{property 'fsEventStream' not found on object of type 'id'}} + +} +@end + |