diff options
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 3 | ||||
| -rw-r--r-- | test/SemaObjC/ivar-sem-check-2.m | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index da50573f23..7eea4ff93e 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -1895,7 +1895,6 @@ Sema::DeclPtrTy Sema::ActOnPropertyImplDecl(SourceLocation AtLoc, // Check that we have a valid, previously declared ivar for @synthesize if (Synthesize) { // @synthesize - bool NoExplicitPropertyIvar = (!PropertyIvar); if (!PropertyIvar) PropertyIvar = PropertyId; QualType PropType = Context.getCanonicalType(property->getType()); @@ -1914,7 +1913,7 @@ Sema::DeclPtrTy Sema::ActOnPropertyImplDecl(SourceLocation AtLoc, // a property implementation and to avoid future warnings. } else if (getLangOptions().ObjCNonFragileABI && - NoExplicitPropertyIvar && ClassDeclared != IDecl) { + ClassDeclared != IDecl) { Diag(PropertyLoc, diag::error_ivar_in_superclass_use) << property->getDeclName() << Ivar->getDeclName() << ClassDeclared->getDeclName(); diff --git a/test/SemaObjC/ivar-sem-check-2.m b/test/SemaObjC/ivar-sem-check-2.m index 2b85685362..6a703b24f3 100644 --- a/test/SemaObjC/ivar-sem-check-2.m +++ b/test/SemaObjC/ivar-sem-check-2.m @@ -1,17 +1,23 @@ // RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin10 -verify %s @interface Super { - id value; // expected-note {{previously declared 'value' here}} + id value2; // expected-note {{previously declared 'value2' here}} } @property(retain) id value; @property(retain) id value1; +@property(retain) id prop; @end -@interface Sub : Super @end +@interface Sub : Super +{ + id value; +} +@end @implementation Sub -@synthesize value; // expected-error {{property 'value' attempting to use ivar 'value' declared in in super class 'Super'}} // expected-note {{previous use is here}} -@synthesize value1=value; // expected-error {{synthesized properties 'value1' and 'value' both claim ivar 'value'}} +@synthesize value; // expected-note {{previous use is here}} +@synthesize value1=value; // expected-error {{synthesized properties 'value1' and 'value' both claim ivar 'value'}} +@synthesize prop=value2; // expected-error {{property 'prop' attempting to use ivar 'value2' declared in in super class 'Super'}} @end |