maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Check for duplicate declaration of a property in current and 

other class extensions. // rdar://7629420

llvm-svn: 118689
This commit is contained in:
Fariborz Jahanian 2010-11-10 18:01:36 +00:00
parent ca21cd749e
commit a0a9d85a5d
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/Sema/SemaObjCProperty.cpp
View File

@ -93,14 +93,22 @@ Sema::HandlePropertyInClassExtension(Scope *S, ObjCCategoryDecl *CDecl,
// Diagnose if this property is already in continuation class.
DeclContext *DC = cast<DeclContext>(CDecl);
IdentifierInfo *PropertyId = FD.D.getIdentifier();
if (ObjCPropertyDecl *prevDecl =
ObjCPropertyDecl::findPropertyDecl(DC, PropertyId)) {
Diag(AtLoc, diag::err_duplicate_property);
Diag(prevDecl->getLocation(), diag::note_property_declare);
return 0;
}
ObjCInterfaceDecl *CCPrimary = CDecl->getClassInterface();
if (CCPrimary)
// Check for duplicate declaration of this property in current and
// other class extensions.
for (const ObjCCategoryDecl *ClsExtDecl =
CCPrimary->getFirstClassExtension();
ClsExtDecl; ClsExtDecl = ClsExtDecl->getNextClassExtension()) {
if (ObjCPropertyDecl *prevDecl =
ObjCPropertyDecl::findPropertyDecl(ClsExtDecl, PropertyId)) {
Diag(AtLoc, diag::err_duplicate_property);
Diag(prevDecl->getLocation(), diag::note_property_declare);
return 0;
}
}
// Create a new ObjCPropertyDecl with the DeclContext being
// the class extension.
ObjCPropertyDecl *PDecl =
@ -115,7 +123,6 @@ Sema::HandlePropertyInClassExtension(Scope *S, ObjCCategoryDecl *CDecl,
// We need to look in the @interface to see if the @property was
// already declared.
ObjCInterfaceDecl *CCPrimary = CDecl->getClassInterface();
if (!CCPrimary) {
Diag(CDecl->getLocation(), diag::err_continuation_class);
*isOverridingProperty = true;

13
clang/test/SemaObjC/duplicate-property-class-extension.m
View File

@ -1,23 +1,24 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// rdar://7629420
@interface Foo
@property (readonly) char foo; // expected-note {{property declared here}}
@property (readonly) char foo;
@property (readwrite) char bar; // expected-note {{property declared here}}
@end
@interface Foo ()
@property (readwrite) char foo; // OK
@property (readwrite) char foo; // expected-note 2 {{property declared here}}
@property (readwrite) char NewProperty; // expected-note 2 {{property declared here}}
@property (readwrite) char bar; // expected-error{{illegal redeclaration of 'readwrite' property in continuation class 'Foo' (perhaps you intended this to be a 'readwrite' redeclaration of a 'readonly' public property?)}}
@end
@interface Foo ()
@property (readwrite) char foo; // OK again, make primary property readwrite for 2nd time!
@property (readwrite) char NewProperty; // expected-error {{redeclaration of property in continuation class 'Foo' (attribute must be 'readwrite', while its primary must be 'readonly')}}
@property (readwrite) char foo; // expected-error {{property has a previous declaration}}
@property (readwrite) char NewProperty; // expected-error {{property has a previous declaration}}
@end
@interface Foo ()
@property (readonly) char foo; // expected-error {{redeclaration of property in continuation class 'Foo' (attribute must be 'readwrite', while its primary must be 'readonly')}}
@property (readwrite) char NewProperty; // expected-error {{redeclaration of property in continuation class 'Foo' (attribute must be 'readwrite', while its primary must be 'readonly')}}
@property (readonly) char foo; // expected-error {{property has a previous declaration}}
@property (readwrite) char NewProperty; // expected-error {{property has a previous declaration}}
@end