diff options
| -rw-r--r-- | lib/Sema/SemaObjCProperty.cpp | 6 | ||||
| -rw-r--r-- | test/SemaObjC/property-and-ivar-use.m | 36 |
2 files changed, 40 insertions, 2 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp index ccb9a15ff2..91f47ab708 100644 --- a/lib/Sema/SemaObjCProperty.cpp +++ b/lib/Sema/SemaObjCProperty.cpp @@ -521,7 +521,7 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, if (getLangOptions().ObjCNonFragileABI2) { // Diagnose if an ivar was lazily synthesdized due to a previous // use and if 1) property is @dynamic or 2) property is synthesized - // but it requires a dirreferently named ivar. + // but it requires an ivar of different name. ObjCInterfaceDecl *ClassDeclared; ObjCIvarDecl *Ivar = 0; if (!Synthesize) @@ -530,7 +530,9 @@ Decl *Sema::ActOnPropertyImplDecl(Scope *S, if (PropertyIvar && PropertyIvar != PropertyId) Ivar = IDecl->lookupInstanceVariable(PropertyId, ClassDeclared); } - if (Ivar && Ivar->getSynthesize()) { + // Issue diagnostics only if Ivar belongs to current class. + if (Ivar && Ivar->getSynthesize() && + IC->getClassInterface() == ClassDeclared) { Diag(Ivar->getLocation(), diag::err_undeclared_var_use) << PropertyId; Ivar->setInvalidDecl(); diff --git a/test/SemaObjC/property-and-ivar-use.m b/test/SemaObjC/property-and-ivar-use.m new file mode 100644 index 0000000000..b9235c1dd3 --- /dev/null +++ b/test/SemaObjC/property-and-ivar-use.m @@ -0,0 +1,36 @@ +// RUN: %clang_cc1 -fsyntax-only -fobjc-nonfragile-abi2 -verify %s +// Do not issue error if 'ivar' used previously belongs to the inherited class +// and has same name as @dynalic property in current class. + +typedef signed char BOOL; + +@protocol IDEBuildable +@property (readonly) BOOL hasRecursiveDependencyCycle; +@end + +@protocol IDEBuildableProduct <IDEBuildable> +@end + +@interface IDEBuildableSupportMixIn +@property (readonly) BOOL hasRecursiveDependencyCycle; +@end + +@interface Xcode3TargetBuildable <IDEBuildable> +{ + IDEBuildableSupportMixIn *_buildableMixIn; +} +@end + +@interface Xcode3TargetProduct : Xcode3TargetBuildable <IDEBuildableProduct> +@end + +@implementation Xcode3TargetBuildable +- (BOOL)hasRecursiveDependencyCycle +{ + return [_buildableMixIn hasRecursiveDependencyCycle]; +} +@end + +@implementation Xcode3TargetProduct +@dynamic hasRecursiveDependencyCycle; +@end |