replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Diagnose that ivars in current and super class may not 

be duplicates and a test case.

llvm-svn: 61068
This commit is contained in:
Fariborz Jahanian 2008-12-16 01:08:35 +00:00
parent e3a6351f34
commit a599c1352b
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/AST/DeclObjC.cpp
View File

@ -345,6 +345,7 @@ void ObjCInterfaceDecl::CollectObjCIvars(std::vector<FieldDecl*> &Fields) {
for (ObjCInterfaceDecl::ivar_iterator I = ivar_begin(),
E = ivar_end(); I != E; ++I) {
ObjCIvarDecl *IVDecl = (*I);
if (!IVDecl->isInvalidDecl())
Fields.push_back(cast<FieldDecl>(IVDecl));
}
}
@ -390,7 +391,8 @@ void ObjCInterfaceDecl::addRecordToClass(ASTContext &Context)
/// FIXME! Can do collection of ivars and adding to the record while
/// doing it.
for (unsigned int i = 0; i != RecFields.size(); i++) {
FieldDecl *Field = FieldDecl::Create(Context, RD, SourceLocation(),
FieldDecl *Field = FieldDecl::Create(Context, RD,
RecFields[i]->getLocation(),
RecFields[i]->getIdentifier(),
RecFields[i]->getType(),
RecFields[i]->getBitWidth(), false, 0);

19
clang/lib/Sema/SemaDecl.cpp
View File

@ -3091,6 +3091,25 @@ void Sema::ActOnFields(Scope* S,
if (ObjCInterfaceDecl *ID = dyn_cast<ObjCInterfaceDecl>(EnclosingDecl)) {
ID->addInstanceVariablesToClass(ClsFields, RecFields.size(), RBrac);
ID->addRecordToClass(Context);
// Must enforce the rule that ivars in the base classes may not be
// duplicates.
FieldIDs.clear();
RecordDecl *RD = ID->getRecordForDecl();
for (RecordDecl::field_iterator i = RD->field_begin(),
e = RD->field_end(); i != e; ++i) {
FieldDecl *FD = *i;
if (IdentifierInfo *II = FD->getIdentifier())
if (!FieldIDs.insert(II)) {
Diag(FD->getLocation(), diag::err_duplicate_member) << II;
FD->setInvalidDecl();
for (RecordDecl::field_iterator j = RD->field_begin(),
e1 = RD->field_end(); j != e1; ++j)
if (II == (*j)->getIdentifier()) {
Diag((*j)->getLocation(), diag::note_previous_definition);
break;
}
}
}
}
else if (ObjCImplementationDecl *IMPDecl =
dyn_cast<ObjCImplementationDecl>(EnclosingDecl)) {

20
clang/test/SemaObjC/duplicate-ivar-check.m Normal file
View File

@ -0,0 +1,20 @@
// RUN: clang -fsyntax-only -verify %s
@interface B1 {
@public
double fill_B; // expected-note {{previous definition is here}}
}
@end
@interface B : B1 {
@public
int one; // expected-note {{previous definition is here}}
int one; // expected-error {{duplicate member 'one'}}
}
@end
@interface A : B {
@public
int fill_B; // expected-error {{duplicate member 'fill_B'}}
}
@end