1 files changed, 15 insertions, 5 deletions

diff --git a/lib/ARCMigrate/TransGCCalls.cpp b/lib/ARCMigrate/TransGCCalls.cpp
index 9c3faae395..8042c6caba 100644
--- a/lib/ARCMigrate/TransGCCalls.cpp
+++ b/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());
         }
       }
     }