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

[arcmt] Don't add __weak if there is already a GC __weak and make sure to clear 

__weak from a readonly property.

llvm-svn: 145210
This commit is contained in:
Argyrios Kyrtzidis 2011-11-28 00:23:12 +00:00
parent 1424b308c3
commit 3fc3dcd80f
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/ARCMigrate/TransGCAttrs.cpp
View File

@ -326,7 +326,8 @@ static void checkAllProps(MigrationContext &MigrateCtx,
for (unsigned i = 0, e = AllProps.size(); i != e; ++i) {
ObjCPropertyDecl *PD = AllProps[i];
if (PD->getPropertyAttributesAsWritten() &
ObjCPropertyDecl::OBJC_PR_assign) {
(ObjCPropertyDecl::OBJC_PR_assign |
ObjCPropertyDecl::OBJC_PR_readonly)) {
SourceLocation AtLoc = PD->getAtLoc();
if (AtLoc.isInvalid())
continue;

18
clang/lib/ARCMigrate/TransProperties.cpp
View File

@ -237,9 +237,12 @@ private:
canUseWeak = false;
for (PropsTy::iterator I = props.begin(), E = props.end(); I != E; ++I) {
if (isUserDeclared(I->IvarD))
Pass.TA.insert(I->IvarD->getLocation(),
canUseWeak ? "__weak " : "__unsafe_unretained ");
if (isUserDeclared(I->IvarD)) {
if (I->IvarD &&
I->IvarD->getType().getObjCLifetime() != Qualifiers::OCL_Weak)
Pass.TA.insert(I->IvarD->getLocation(),
canUseWeak ? "__weak " : "__unsafe_unretained ");
}
if (I->ImplD)
Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership,
I->ImplD->getLocation());
@ -257,9 +260,12 @@ private:
canUseWeak = false;
for (PropsTy::iterator I = props.begin(), E = props.end(); I != E; ++I) {
if (isUserDeclared(I->IvarD))
Pass.TA.insert(I->IvarD->getLocation(),
canUseWeak ? "__weak " : "__unsafe_unretained ");
if (isUserDeclared(I->IvarD)) {
if (I->IvarD &&
I->IvarD->getType().getObjCLifetime() != Qualifiers::OCL_Weak)
Pass.TA.insert(I->IvarD->getLocation(),
canUseWeak ? "__weak " : "__unsafe_unretained ");
}
if (I->ImplD) {
Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership,
I->ImplD->getLocation());

6
clang/test/ARCMT/GC.m
View File

@ -58,6 +58,8 @@ __attribute__((objc_arc_weak_reference_unavailable))
@interface I4Impl {
I4Impl *pds2;
I4Impl *pds3;
__weak I4Impl *pw3;
__weak I4Impl *pw4;
}
@property (assign) I4Impl *__weak pw1, *__weak pw2;
@property (assign) I4Impl *__strong ps;
@ -65,10 +67,12 @@ __attribute__((objc_arc_weak_reference_unavailable))
@property (assign) I4Impl * pds2;
@property (readwrite) I4Impl * pds3;
@property (readonly) I4Impl * pds4;
@property (readonly) __weak I4Impl *pw3;
@property (assign) __weak I4Impl *pw4;
@end
@implementation I4Impl
@synthesize pw1, pw2, ps, pds, pds2, pds3, pds4;
@synthesize pw1, pw2, pw3, pw4, ps, pds, pds2, pds3, pds4;
-(void)test1:(CFTypeRef *)cft {
id x = NSMakeCollectable(cft);

6
clang/test/ARCMT/GC.m.result
View File

@ -53,6 +53,8 @@ __attribute__((objc_arc_weak_reference_unavailable))
@interface I4Impl {
I4Impl *pds2;
I4Impl *pds3;
__weak I4Impl *pw3;
__weak I4Impl *pw4;
}
@property (weak) I4Impl * pw1, * pw2;
@property I4Impl * ps;
@ -60,10 +62,12 @@ __attribute__((objc_arc_weak_reference_unavailable))
@property I4Impl * pds2;
@property (readwrite) I4Impl * pds3;
@property (readonly) I4Impl * pds4;
@property (weak, readonly) I4Impl *pw3;
@property (weak) I4Impl *pw4;
@end
@implementation I4Impl
@synthesize pw1, pw2, ps, pds, pds2, pds3, pds4;
@synthesize pw1, pw2, pw3, pw4, ps, pds, pds2, pds3, pds4;
-(void)test1:(CFTypeRef *)cft {
id x = CFBridgingRelease(cft);