diff options
| -rw-r--r-- | clang/lib/ARCMigrate/TransGCCalls.cpp | 20 | ||||
| -rw-r--r-- | clang/test/ARCMT/GC-check.m | 11 |
2 files changed, 26 insertions, 5 deletions
diff --git a/clang/lib/ARCMigrate/TransGCCalls.cpp b/clang/lib/ARCMigrate/TransGCCalls.cpp index 9c3faae395b..8042c6caba7 100644 --- a/clang/lib/ARCMigrate/TransGCCalls.cpp +++ b/clang/lib/ARCMigrate/TransGCCalls.cpp @@ -22,27 +22,37 @@ class GCCollectableCallsChecker : MigrationContext &MigrateCtx; ParentMap &PMap; IdentifierInfo *NSMakeCollectableII; + IdentifierInfo *CFMakeCollectableII; public: GCCollectableCallsChecker(MigrationContext &ctx, ParentMap &map) : MigrateCtx(ctx), PMap(map) { - NSMakeCollectableII = - &MigrateCtx.getPass().Ctx.Idents.get("NSMakeCollectable"); + IdentifierTable &Ids = MigrateCtx.getPass().Ctx.Idents; + NSMakeCollectableII = &Ids.get("NSMakeCollectable"); + CFMakeCollectableII = &Ids.get("CFMakeCollectable"); } bool VisitCallExpr(CallExpr *E) { + TransformActions &TA = MigrateCtx.getPass().TA; + Expr *CEE = E->getCallee()->IgnoreParenImpCasts(); if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(CEE)) { if (FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(DRE->getDecl())) { - if (FD->getDeclContext()->getRedeclContext()->isFileContext() && - FD->getIdentifier() == NSMakeCollectableII) { - TransformActions &TA = MigrateCtx.getPass().TA; + if (!FD->getDeclContext()->getRedeclContext()->isFileContext()) + return true; + + if (FD->getIdentifier() == NSMakeCollectableII) { Transaction Trans(TA); TA.clearDiagnostic(diag::err_unavailable, diag::err_unavailable_message, diag::err_ovl_deleted_call, // ObjC++ DRE->getSourceRange()); TA.replace(DRE->getSourceRange(), "CFBridgingRelease"); + + } else if (FD->getIdentifier() == CFMakeCollectableII) { + TA.reportError("CFMakeCollectable will leak the object that it " + "receives in ARC", DRE->getLocation(), + DRE->getSourceRange()); } } } diff --git a/clang/test/ARCMT/GC-check.m b/clang/test/ARCMT/GC-check.m new file mode 100644 index 00000000000..0d5e878d761 --- /dev/null +++ b/clang/test/ARCMT/GC-check.m @@ -0,0 +1,11 @@ +// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only %s +// RUN: %clang_cc1 -arcmt-check -verify -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s + +#define CF_AUTOMATED_REFCOUNT_UNAVAILABLE __attribute__((unavailable("not available in automatic reference counting mode"))) +typedef const void * CFTypeRef; +CFTypeRef CFMakeCollectable(CFTypeRef cf) CF_AUTOMATED_REFCOUNT_UNAVAILABLE; // expected-note {{unavailable}} + +void test1(CFTypeRef *cft) { + CFTypeRef c = CFMakeCollectable(cft); // expected-error {{CFMakeCollectable will leak the object that it receives in ARC}} \ + // expected-error {{unavailable}} +} |
