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

Don't crash when a duplicate interface/protocol is inside an extern "C" context. 

llvm-svn: 144508
This commit is contained in:
Argyrios Kyrtzidis 2011-11-13 22:08:30 +00:00
parent ce7cc08f3a
commit 95dfc12cd6
3 changed files with 65 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
clang/lib/Sema/SemaDeclObjC.cpp
View File

@ -373,9 +373,15 @@ ActOnStartClassInterface(SourceLocation AtInterfaceLoc,
Diag(AtInterfaceLoc, diag::err_duplicate_class_def)<<IDecl->getDeclName();
Diag(IDecl->getLocation(), diag::note_previous_definition);
// Return the previous class interface.
// FIXME: don't leak the objects passed in!
return ActOnObjCContainerStartDefinition(IDecl);
// Create a new one; the other may be in a different DeclContex, (e.g.
// this one may be in a LinkageSpecDecl while the other is not) which
// will break invariants.
IDecl = ObjCInterfaceDecl::Create(Context, CurContext, AtInterfaceLoc,
ClassName, ClassLoc);
if (AttrList)
ProcessDeclAttributeList(TUScope, IDecl, AttrList);
PushOnScopeChains(IDecl, TUScope);
} else {
IDecl->setLocation(ClassLoc);
IDecl->setAtStartLoc(AtInterfaceLoc);
@ -575,23 +581,30 @@ Sema::ActOnStartProtocolInterface(SourceLocation AtProtoInterfaceLoc,
if (!PDecl->isForwardDecl()) {
Diag(ProtocolLoc, diag::warn_duplicate_protocol_def) << ProtocolName;
Diag(PDecl->getLocation(), diag::note_previous_definition);
// Just return the protocol we already had.
// FIXME: don't leak the objects passed in!
return ActOnObjCContainerStartDefinition(PDecl);
}
ObjCList<ObjCProtocolDecl> PList;
PList.set((ObjCProtocolDecl *const*)ProtoRefs, NumProtoRefs, Context);
err = CheckForwardProtocolDeclarationForCircularDependency(
ProtocolName, ProtocolLoc, PDecl->getLocation(), PList);
// Make sure the cached decl gets a valid start location.
PDecl->setAtStartLoc(AtProtoInterfaceLoc);
PDecl->setLocation(ProtocolLoc);
// Since this ObjCProtocolDecl was created by a forward declaration,
// we now add it to the DeclContext since it wasn't added before
PDecl->setLexicalDeclContext(CurContext);
CurContext->addDecl(PDecl);
PDecl->completedForwardDecl();
// Create a new one; the other may be in a different DeclContex, (e.g.
// this one may be in a LinkageSpecDecl while the other is not) which
// will break invariants.
// We will not add it to scope chains to ignore it as the warning says.
PDecl = ObjCProtocolDecl::Create(Context, CurContext, ProtocolName,
ProtocolLoc, AtProtoInterfaceLoc,
/*isForwardDecl=*/false);
} else {
ObjCList<ObjCProtocolDecl> PList;
PList.set((ObjCProtocolDecl *const*)ProtoRefs, NumProtoRefs, Context);
err = CheckForwardProtocolDeclarationForCircularDependency(
ProtocolName, ProtocolLoc, PDecl->getLocation(), PList);
// Make sure the cached decl gets a valid start location.
PDecl->setAtStartLoc(AtProtoInterfaceLoc);
PDecl->setLocation(ProtocolLoc);
// Since this ObjCProtocolDecl was created by a forward declaration,
// we now add it to the DeclContext since it wasn't added before
PDecl->setLexicalDeclContext(CurContext);
CurContext->addDecl(PDecl);
PDecl->completedForwardDecl();
}
} else {
PDecl = ObjCProtocolDecl::Create(Context, CurContext, ProtocolName,
ProtocolLoc, AtProtoInterfaceLoc,

6
clang/test/SemaObjC/alias-test-2.m
View File

@ -9,9 +9,9 @@
@compatibility_alias AliasForSuper Super;
@interface MyAlias : AliasForSuper // expected-error {{duplicate interface definition for class 'MyWpModule'}}
@end
@implementation MyAlias : AliasForSuper // expected-error {{conflicting super class name 'Super'}}
@end
@interface MyAlias : AliasForSuper // expected-error {{duplicate interface definition for class 'MyWpModule'}}
@end

30
clang/test/SemaObjCXX/objc-extern-c.mm Normal file
View File

@ -0,0 +1,30 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
@protocol P // expected-note {{previous}}
-(void)meth1;
@end
@interface I // expected-note {{previous}}
@end
@interface I2
@end
@interface I2(C) // expected-note {{previous}}
@end
extern "C" {
@protocol P // expected-warning {{duplicate protocol definition of 'P' is ignored}}
-(void)meth2;
@end
@interface I // expected-error {{duplicate}}
@end
@interface I2(C) // expected-warning {{duplicate}}
@end
}
void test(id<P> p) {
[p meth1];
[p meth2]; // expected-warning {{not found}}
}