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

Diagnose misuse of __strong attribute in a redeclaration. 

llvm-svn: 72737
This commit is contained in:
Fariborz Jahanian 2009-06-02 20:58:58 +00:00
parent 5273aa29eb
commit 991a2b1933
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/AST/ASTContext.cpp
View File

@ -3033,13 +3033,15 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) {
if (RHSClass == Type::ExtQual) {
QualType::GCAttrTypes GCAttr = RHSCan.getObjCGCAttr();
if (GCAttr != QualType::GCNone) {
QualType::GCAttrTypes GCLHSAttr = LHSCan.getObjCGCAttr();
// __weak attribute must appear on both declarations.
// FIXME. __strong attribue is redundant if other decl is an objective-c
// object pointer (or decorated with __strong attribute). We can't issue
// diagnostic on __strong mismatch becuase 'id' may not be
// available but only with its canonical type at this point. Will
// visit this when 'id' becomes a concrete type.
if (GCAttr == QualType::Weak && LHSCan.getObjCGCAttr() != GCAttr)
// __strong attribue is redundant if other decl is an objective-c
// object pointer (or decorated with __strong attribute); otherwise
// issue error.
if ((GCAttr == QualType::Weak && GCLHSAttr != GCAttr) ||
(GCAttr == QualType::Strong && GCLHSAttr != GCAttr &&
LHSCan->isPointerType() && !isObjCObjectPointerType(LHSCan) &&
!isObjCIdStructType(LHSCan->getAsPointerType()->getPointeeType())))
return QualType();
RHS = QualType(cast<ExtQualType>(RHS.getDesugaredType())->getBaseType(),
@ -3059,10 +3061,15 @@ QualType ASTContext::mergeTypes(QualType LHS, QualType RHS) {
if (GCAttr != QualType::GCNone) {
QualType::GCAttrTypes GCRHSAttr = RHSCan.getObjCGCAttr();
// __weak attribute must appear on both declarations. __strong
// attribue is redundant if other decl is an objective-c object pointer.
// See above FIXME comment.
if (GCAttr == QualType::Weak && GCRHSAttr != GCAttr)
// __strong attribue is redundant if other decl is an objective-c
// object pointer (or decorated with __strong attribute); otherwise
// issue error.
if ((GCAttr == QualType::Weak && GCRHSAttr != GCAttr) ||
(GCAttr == QualType::Strong && GCRHSAttr != GCAttr &&
RHSCan->isPointerType() && !isObjCObjectPointerType(RHSCan) &&
!isObjCIdStructType(RHSCan->getAsPointerType()->getPointeeType())))
return QualType();
LHS = QualType(cast<ExtQualType>(LHS.getDesugaredType())->getBaseType(),
LHS.getCVRQualifiers());
QualType Result = mergeTypes(LHS, RHS);

12
clang/test/SemaObjC/objc2-merge-gc-attribue-decl.m
View File

@ -16,3 +16,15 @@ extern id WLoopGetMain(); // expected-error {{conflicting types for 'WLoopGetMai
extern id p3; // expected-note {{previous definition is here}}
extern __weak id p3; // expected-error {{redefinition of 'p3' with a different type}}
extern void *p4; // expected-note {{previous definition is here}}
extern void * __strong p4; // expected-error {{redefinition of 'p4' with a different type}}
extern id p5;
extern __strong id p5;
extern char* __strong p6; // expected-note {{previous definition is here}}
extern char* p6; // expected-error {{redefinition of 'p6' with a different type}}
// FIXME. We do not issue error here because we don't put the attribute on the pointer type.
extern __strong char* p7;
extern char* p7;