From: Argyrios Kyrtzidis Date: Mon, 7 Nov 2011 18:40:29 +0000 (+0000) Subject: [arcmt] In GC, change '__weak' -> '__unsafe_unretained' when applied X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12192cf50a96cb59a3039af044b7fa97f043101c;p=clang [arcmt] In GC, change '__weak' -> '__unsafe_unretained' when applied to objects of classes that don't support ARC weak git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143976 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/ARCMigrate/TransGCAttrs.cpp b/lib/ARCMigrate/TransGCAttrs.cpp index 79dc0538b6..94eb8781df 100644 --- a/lib/ARCMigrate/TransGCAttrs.cpp +++ b/lib/ARCMigrate/TransGCAttrs.cpp @@ -12,6 +12,7 @@ #include "clang/Lex/Lexer.h" #include "clang/Basic/SourceManager.h" #include "clang/Analysis/Support/SaveAndRestore.h" +#include "clang/Sema/SemaDiagnostic.h" using namespace clang; using namespace arcmt; @@ -81,6 +82,8 @@ public: ASTContext &Ctx = MigrateCtx.Pass.Ctx; SourceManager &SM = Ctx.getSourceManager(); + if (Loc.isMacroID()) + Loc = SM.getImmediateExpansionRange(Loc).first; llvm::SmallString<32> Buf; bool Invalid = false; StringRef Spell = Lexer::getSpelling( @@ -101,7 +104,7 @@ public: MigrationContext::GCAttrOccurrence &Attr = MigrateCtx.GCAttrs.back(); Attr.Kind = Kind; - Attr.Loc = SM.getImmediateExpansionRange(Loc).first; + Attr.Loc = Loc; Attr.ModifiedType = TL.getModifiedLoc().getType(); Attr.Dcl = D; Attr.FullyMigratable = FullyMigratable; @@ -202,12 +205,35 @@ static void errorForGCAttrsOnNonObjC(MigrationContext &MigrateCtx) { } } +static void checkWeakGCAttrs(MigrationContext &MigrateCtx) { + TransformActions &TA = MigrateCtx.Pass.TA; + + for (unsigned i = 0, e = MigrateCtx.GCAttrs.size(); i != e; ++i) { + MigrationContext::GCAttrOccurrence &Attr = MigrateCtx.GCAttrs[i]; + if (Attr.Kind == MigrationContext::GCAttrOccurrence::Weak && + Attr.FullyMigratable) { + if (Attr.ModifiedType.isNull() || + !Attr.ModifiedType->isObjCRetainableType()) + continue; + if (!canApplyWeak(MigrateCtx.Pass.Ctx, Attr.ModifiedType, + /*AllowOnUnknownClass=*/true)) { + Transaction Trans(TA); + TA.replaceText(Attr.Loc, "__weak", "__unsafe_unretained"); + TA.clearDiagnostic(diag::err_arc_weak_no_runtime, + diag::err_arc_unsupported_weak_class, + Attr.Loc); + } + } + } +} + void GCAttrsTraverser::traverseTU(MigrationContext &MigrateCtx) { GCAttrsCollector(MigrateCtx).TraverseDecl( MigrateCtx.Pass.Ctx.getTranslationUnitDecl()); clearRedundantStrongs(MigrateCtx); errorForGCAttrsOnNonObjC(MigrateCtx); + checkWeakGCAttrs(MigrateCtx); } void MigrationContext::dumpGCAttrs() { diff --git a/lib/ARCMigrate/Transforms.cpp b/lib/ARCMigrate/Transforms.cpp index c82f075bca..a736c2419e 100644 --- a/lib/ARCMigrate/Transforms.cpp +++ b/lib/ARCMigrate/Transforms.cpp @@ -64,7 +64,8 @@ static bool isClassInWeakBlacklist(ObjCInterfaceDecl *cls) { return isClassInWeakBlacklist(cls->getSuperClass()); } -bool trans::canApplyWeak(ASTContext &Ctx, QualType type) { +bool trans::canApplyWeak(ASTContext &Ctx, QualType type, + bool AllowOnUnknownClass) { if (!Ctx.getLangOptions().ObjCRuntimeHasWeak) return false; @@ -73,9 +74,9 @@ bool trans::canApplyWeak(ASTContext &Ctx, QualType type) { T = ptr->getPointeeType(); if (const ObjCObjectPointerType *ObjT = T->getAs()) { ObjCInterfaceDecl *Class = ObjT->getInterfaceDecl(); - if (!Class || Class->getName() == "NSObject") + if (!AllowOnUnknownClass && (!Class || Class->getName() == "NSObject")) return false; // id/NSObject is not safe for weak. - if (Class->isForwardDecl()) + if (!AllowOnUnknownClass && Class->isForwardDecl()) return false; // forward classes are not verifiable, therefore not safe. if (Class->isArcWeakrefUnavailable()) return false; diff --git a/lib/ARCMigrate/Transforms.h b/lib/ARCMigrate/Transforms.h index 3f1e737e23..7960a7df2e 100644 --- a/lib/ARCMigrate/Transforms.h +++ b/lib/ARCMigrate/Transforms.h @@ -137,7 +137,8 @@ public: //===----------------------------------------------------------------------===// /// \brief Determine whether we can add weak to the given type. -bool canApplyWeak(ASTContext &Ctx, QualType type); +bool canApplyWeak(ASTContext &Ctx, QualType type, + bool AllowOnUnknownClass = false); /// \brief 'Loc' is the end of a statement range. This returns the location /// immediately after the semicolon following the statement. diff --git a/test/ARCMT/GC.m b/test/ARCMT/GC.m index 470ec64ab9..b3ba2a4211 100644 --- a/test/ARCMT/GC.m +++ b/test/ARCMT/GC.m @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-gc-only -x objective-c %s > %t +// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-runtime-has-weak -fobjc-arc -x objective-c %s.result +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-gc-only -x objective-c %s > %t // RUN: diff %t %s.result -// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-gc-only -x objective-c++ %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-gc-only -x objective-c++ %s > %t // RUN: diff %t %s.result #include "Common.h" @@ -41,3 +41,10 @@ void test1(CFTypeRef *cft) { test1(0); } @end + +__attribute__((objc_arc_weak_reference_unavailable)) +@interface QQ { + __weak id s; + __weak QQ *q; +} +@end diff --git a/test/ARCMT/GC.m.result b/test/ARCMT/GC.m.result index 0be8efdcec..405219ff3a 100644 --- a/test/ARCMT/GC.m.result +++ b/test/ARCMT/GC.m.result @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-arc -x objective-c %s.result -// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-gc-only -x objective-c %s > %t +// RUN: %clang_cc1 -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-runtime-has-weak -fobjc-arc -x objective-c %s.result +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-gc-only -x objective-c %s > %t // RUN: diff %t %s.result -// RUN: arcmt-test --args -triple x86_64-apple-darwin10 -fsyntax-only -fobjc-gc-only -x objective-c++ %s > %t +// RUN: arcmt-test --args -triple x86_64-apple-macosx10.7 -fsyntax-only -fobjc-gc-only -x objective-c++ %s > %t // RUN: diff %t %s.result #include "Common.h" @@ -36,3 +36,10 @@ void test1(CFTypeRef *cft) { test1(0); } @end + +__attribute__((objc_arc_weak_reference_unavailable)) +@interface QQ { + __weak id s; + __unsafe_unretained QQ *q; +} +@end