[arcmt] In GC, error for use of CFMakeCollectable because it will leak the
object that it receives in ARC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143700 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ARCMigrate/TransGCCalls.cpp b/lib/ARCMigrate/TransGCCalls.cpp
index 9c3faae..8042c6c 100644
--- a/lib/ARCMigrate/TransGCCalls.cpp
+++ b/lib/ARCMigrate/TransGCCalls.cpp
@@ -22,27 +22,37 @@
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());
}
}
}