diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-12-17 00:49:09 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-12-17 00:49:09 +0000 |
| commit | 057a17e4c518e218aee42323f901fb25f17543c2 (patch) | |
| tree | 862e32924e7cc5c0460ede8a01923f338e07c527 | |
| parent | aadf060b924056f6ec83ce61ca75f529cb2276f4 (diff) | |
| download | bcm5719-llvm-057a17e4c518e218aee42323f901fb25f17543c2.tar.gz bcm5719-llvm-057a17e4c518e218aee42323f901fb25f17543c2.zip | |
Diagnose duplicate declaration of a property. Fixes
PR5809
llvm-svn: 91575
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 9 | ||||
| -rw-r--r-- | clang/test/SemaObjC/property.m | 9 |
3 files changed, 19 insertions, 1 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 2c3f85f2be3..beb44f275a7 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1695,6 +1695,8 @@ def err_unexpected_interface : Error< def err_ref_non_value : Error<"%0 does not refer to a value">; def err_property_not_found : Error< "property %0 not found on object of type %1">; +def err_duplicate_property : Error< + "property has a previous declaration">; def ext_gnu_void_ptr : Extension< "use of GNU void* extension">, InGroup<PointerArith>; def ext_gnu_ptr_func_arith : Extension< diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index ea7d9a93858..beadb588f3e 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -2032,7 +2032,14 @@ Sema::DeclPtrTy Sema::ActOnProperty(Scope *S, SourceLocation AtLoc, ObjCPropertyDecl *PDecl = ObjCPropertyDecl::Create(Context, DC, FD.D.getIdentifierLoc(), FD.D.getIdentifier(), T); - DC->addDecl(PDecl); + DeclContext::lookup_result Found = DC->lookup(PDecl->getDeclName()); + if (Found.first != Found.second && isa<ObjCPropertyDecl>(*Found.first)) { + Diag(PDecl->getLocation(), diag::err_duplicate_property); + Diag((*Found.first)->getLocation(), diag::note_property_declare); + PDecl->setInvalidDecl(); + } + else + DC->addDecl(PDecl); if (T->isArrayType() || T->isFunctionType()) { Diag(AtLoc, diag::err_property_type) << T; diff --git a/clang/test/SemaObjC/property.m b/clang/test/SemaObjC/property.m index a7f3c2012f7..bc2056c9791 100644 --- a/clang/test/SemaObjC/property.m +++ b/clang/test/SemaObjC/property.m @@ -53,3 +53,12 @@ typedef id BYObjectIdentifier; @property(copy) BYObjectIdentifier identifier; @end +@interface Foo2 +{ + int ivar; +} +@property int treeController; // expected-note {{property declared here}} +@property int ivar; // OK +@property int treeController; // expected-error {{property has a previous declaration}} +@end + |
