From bcdc282d853cea666c61a8067154075da2914467 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Tue, 31 Jan 2012 23:42:37 +0000
Subject: objc-arc: In various diagnostics mention
 CFBridgingRetain/CFBridgingRelease calls instead of
 __bridge_retained/__bridge_transfer casts as preferred way of moving cf
 objects to arc land. // rdar://10207950

llvm-svn: 149449
---
 clang/lib/Sema/SemaExprObjC.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'clang/lib/Sema/SemaExprObjC.cpp')

diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp
index 8ea9a9f2b1a..a0a580c5479 100644
--- a/clang/lib/Sema/SemaExprObjC.cpp
+++ b/clang/lib/Sema/SemaExprObjC.cpp
@@ -1951,7 +1951,7 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
     S.Diag(noteLoc, diag::note_arc_bridge_transfer)
       << castExprType
       << (CCK != Sema::CCK_CStyleCast ? FixItHint() :
-            FixItHint::CreateInsertion(afterLParen, "__bridge_transfer "));
+            FixItHint::CreateInsertion(afterLParen, "CFBridgeRelease "));
 
     return;
   }
@@ -1973,7 +1973,7 @@ diagnoseObjCARCConversion(Sema &S, SourceRange castRange,
     S.Diag(noteLoc, diag::note_arc_bridge_retained)
       << castType
       << (CCK != Sema::CCK_CStyleCast ? FixItHint() :
-            FixItHint::CreateInsertion(afterLParen, "__bridge_retained "));
+            FixItHint::CreateInsertion(afterLParen, "CFBridgeRetain "));
 
     return;
   }
@@ -2217,7 +2217,7 @@ ExprResult Sema::BuildObjCBridgedCast(SourceLocation LParenLoc,
       Diag(BridgeKeywordLoc, diag::note_arc_bridge_transfer)
         << FromType
         << FixItHint::CreateReplacement(BridgeKeywordLoc, 
-                                        "__bridge_transfer ");
+                                        "CFBridgeRelease ");
 
       Kind = OBC_Bridge;
       break;
@@ -2257,7 +2257,7 @@ ExprResult Sema::BuildObjCBridgedCast(SourceLocation LParenLoc,
         << FixItHint::CreateReplacement(BridgeKeywordLoc, "__bridge ");
       Diag(BridgeKeywordLoc, diag::note_arc_bridge_retained)
         << T
-        << FixItHint::CreateReplacement(BridgeKeywordLoc, "__bridge_retained ");
+        << FixItHint::CreateReplacement(BridgeKeywordLoc, "CFBridgeRetain ");
         
       Kind = OBC_Bridge;
       break;
-- 
cgit v1.2.3