[cfe-commits] r149449 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaExprObjC.cpp test/ARCMT/checking.m test/ARCMT/no-canceling-bridge-to-bridge-cast.m test/ARCMT/nonobjc-to-objc-cast-2.m test/SemaObjC/arc-bridged-cast.m test/SemaObjC/arc-cf.m test/SemaObjC/arc-type-conversion.m test/SemaObjC/arc-unbridged-cast.m test/SemaObjC/arc.m test/SemaObjCXX/arc-unbridged-cast.mm
Douglas Gregor
dgregor at apple.com
Tue Jan 31 20:30:07 PST 2012
On Jan 31, 2012, at 3:42 PM, Fariborz Jahanian wrote:
> Author: fjahanian
> Date: Tue Jan 31 17:42:37 2012
> New Revision: 149449
>
> URL: http://llvm.org/viewvc/llvm-project?rev=149449&view=rev
> Log:
> 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
Shouldn't you at least check that CFBridgeRetain/CFBridgeRelease are known before doing this?
- Doug
> Modified:
> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> cfe/trunk/lib/Sema/SemaExprObjC.cpp
> cfe/trunk/test/ARCMT/checking.m
> cfe/trunk/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
> cfe/trunk/test/ARCMT/nonobjc-to-objc-cast-2.m
> cfe/trunk/test/SemaObjC/arc-bridged-cast.m
> cfe/trunk/test/SemaObjC/arc-cf.m
> cfe/trunk/test/SemaObjC/arc-type-conversion.m
> cfe/trunk/test/SemaObjC/arc-unbridged-cast.m
> cfe/trunk/test/SemaObjC/arc.m
> cfe/trunk/test/SemaObjCXX/arc-unbridged-cast.mm
>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
> +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Tue Jan 31 17:42:37 2012
> @@ -3309,9 +3309,9 @@
> def note_arc_bridge : Note<
> "use __bridge to convert directly (no change in ownership)">;
> def note_arc_bridge_transfer : Note<
> - "use __bridge_transfer to transfer ownership of a +1 %0 into ARC">;
> + "use CFBridgeRelease call to transfer ownership of a +1 %0 into ARC">;
> def note_arc_bridge_retained : Note<
> - "use __bridge_retained to make an ARC object available as a +1 %0">;
> + "use CFBridgeRetain call to make an ARC object available as a +1 %0">;
>
> } // ARC Casting category
>
>
> Modified: cfe/trunk/lib/Sema/SemaExprObjC.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprObjC.cpp?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaExprObjC.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaExprObjC.cpp Tue Jan 31 17:42:37 2012
> @@ -1951,7 +1951,7 @@
> 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 @@
> 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 @@
> Diag(BridgeKeywordLoc, diag::note_arc_bridge_transfer)
> << FromType
> << FixItHint::CreateReplacement(BridgeKeywordLoc,
> - "__bridge_transfer ");
> + "CFBridgeRelease ");
>
> Kind = OBC_Bridge;
> break;
> @@ -2257,7 +2257,7 @@
> << 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;
>
> Modified: cfe/trunk/test/ARCMT/checking.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/checking.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/ARCMT/checking.m (original)
> +++ cfe/trunk/test/ARCMT/checking.m Tue Jan 31 17:42:37 2012
> @@ -95,7 +95,7 @@
> CFStringRef cfstr;
> NSString *str = (NSString *)cfstr; // expected-error {{cast of C pointer type 'CFStringRef' (aka 'const struct __CFString *') to Objective-C pointer type 'NSString *' requires a bridged cast}} \
> // expected-note {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_transfer to transfer ownership of a +1 'CFStringRef' (aka 'const struct __CFString *') into ARC}} \
> + // expected-note {{use CFBridgeRelease call to transfer ownership of a +1 'CFStringRef' (aka 'const struct __CFString *') into ARC}} \
> str = (NSString *)kUTTypePlainText;
> str = b ? kUTTypeRTF : kUTTypePlainText;
> str = (NSString *)(b ? kUTTypeRTF : kUTTypePlainText);
> @@ -153,10 +153,10 @@
> (void)(void*)voidp_val;
> (void)(void**)arg; // expected-error {{disallowed}}
> cvt((void*)arg); // expected-error 2 {{requires a bridged cast}} \
> - // expected-note 2 {{use __bridge to}} expected-note {{use __bridge_transfer}} expected-note {{use __bridge_retained}}
> + // expected-note 2 {{use __bridge to}} expected-note {{use CFBridgeRelease call}} expected-note {{use CFBridgeRetain call}}
> cvt(0);
> (void)(__strong id**)(0);
> - return arg; // expected-error {{requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use __bridge_retained}}
> + return arg; // expected-error {{requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use CFBridgeRetain call}}
> }
>
>
>
> Modified: cfe/trunk/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/no-canceling-bridge-to-bridge-cast.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/ARCMT/no-canceling-bridge-to-bridge-cast.m (original)
> +++ cfe/trunk/test/ARCMT/no-canceling-bridge-to-bridge-cast.m Tue Jan 31 17:42:37 2012
> @@ -23,15 +23,15 @@
>
> result = (id) CFRetain([NSString stringWithFormat:@"PBXLoopMode"]); // expected-error {{cast of C pointer type 'CFTypeRef' (aka 'const void *') to Objective-C pointer type 'id' requires a bridged cast}} \
> // expected-note {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_transfer to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
> + // expected-note {{use CFBridgeRelease call to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
>
> result = (id) CFRetain((id)((objc_format))); // expected-error {{cast of C pointer type 'CFTypeRef' (aka 'const void *') to Objective-C pointer type 'id' requires a bridged cast}} \
> // expected-note {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_transfer to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
> + // expected-note {{use CFBridgeRelease call to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
>
> result = (id) CFRetain((id)((cf_format))); // expected-error {{cast of C pointer type 'CFTypeRef' (aka 'const void *') to Objective-C pointer type 'id' requires a bridged cast}} \
> // expected-note {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_transfer to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
> + // expected-note {{use CFBridgeRelease call to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
>
> result = (id) CFRetain((CFTypeRef)((objc_format)));
>
>
> Modified: cfe/trunk/test/ARCMT/nonobjc-to-objc-cast-2.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/nonobjc-to-objc-cast-2.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/ARCMT/nonobjc-to-objc-cast-2.m (original)
> +++ cfe/trunk/test/ARCMT/nonobjc-to-objc-cast-2.m Tue Jan 31 17:42:37 2012
> @@ -14,8 +14,8 @@
> CFStringRef cfstr;
> NSString *str = (NSString *)cfstr; // expected-error {{cast of C pointer type 'CFStringRef' (aka 'const struct __CFString *') to Objective-C pointer type 'NSString *' requires a bridged cast}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_transfer to transfer ownership of a +1 'CFStringRef' (aka 'const struct __CFString *') into ARC}}
> - void *vp = str; // expected-error {{requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use __bridge}}
> + // expected-note{{use CFBridgeRelease call to transfer ownership of a +1 'CFStringRef' (aka 'const struct __CFString *') into ARC}}
> + void *vp = str; // expected-error {{requires a bridged cast}} expected-note {{use CFBridgeRetain call}} expected-note {{use __bridge}}
> }
>
> void f2(NSString *s) {
> @@ -23,7 +23,7 @@
> ref = [(CFStringRef)[s string] retain]; // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef' (aka 'const struct __CFString *') requires a bridged cast}} \
> // expected-error {{bad receiver type 'CFStringRef' (aka 'const struct __CFString *')}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_retained to make an ARC object available as a +1 'CFStringRef' (aka 'const struct __CFString *')}}
> + // expected-note{{use CFBridgeRetain call to make an ARC object available as a +1 'CFStringRef' (aka 'const struct __CFString *')}}
> }
>
> CFStringRef f3() {
>
> Modified: cfe/trunk/test/SemaObjC/arc-bridged-cast.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-bridged-cast.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/arc-bridged-cast.m (original)
> +++ cfe/trunk/test/SemaObjC/arc-bridged-cast.m Tue Jan 31 17:42:37 2012
> @@ -35,8 +35,8 @@
> void fixits() {
> id obj1 = (id)CFCreateSomething(); // expected-error{{cast of C pointer type 'CFTypeRef' (aka 'const void *') to Objective-C pointer type 'id' requires a bridged cast}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_transfer to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
> + // expected-note{{use CFBridgeRelease call to transfer ownership of a +1 'CFTypeRef' (aka 'const void *') into ARC}}
> CFTypeRef cf1 = (CFTypeRef)CreateSomething(); // expected-error{{cast of Objective-C pointer type 'id' to C pointer type 'CFTypeRef' (aka 'const void *') requires a bridged cast}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_retained to make an ARC object available as a +1 'CFTypeRef' (aka 'const void *')}}
> + // expected-note{{use CFBridgeRetain call to make an ARC object available as a +1 'CFTypeRef' (aka 'const void *')}}
> }
>
> Modified: cfe/trunk/test/SemaObjC/arc-cf.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-cf.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/arc-cf.m (original)
> +++ cfe/trunk/test/SemaObjC/arc-cf.m Tue Jan 31 17:42:37 2012
> @@ -11,8 +11,8 @@
> extern CFStringRef CFCreateString0(void);
> void test0() {
> id x;
> - x = (id) CFMakeString0(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{__bridge_transfer to transfer}}
> - x = (id) CFCreateString0(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{__bridge_transfer to transfer}}
> + x = (id) CFMakeString0(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{CFBridgeRelease call to transfer}}
> + x = (id) CFCreateString0(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{CFBridgeRelease call to transfer}}
> }
>
> extern CFStringRef CFMakeString1(void) __attribute__((cf_returns_not_retained));
> @@ -20,7 +20,7 @@
> void test1() {
> id x;
> x = (id) CFMakeString1();
> - x = (id) CFCreateString1(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{__bridge_transfer to transfer}}
> + x = (id) CFCreateString1(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{CFBridgeRelease call to transfer}}
> }
>
> #define CF_AUDIT_BEGIN _Pragma("clang arc_cf_code_audited begin")
> @@ -38,6 +38,6 @@
> id x;
> x = (id) CFMakeString2();
> x = (id) CFCreateString2();
> - x = (id) CFMakeString3(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{__bridge_transfer to transfer}}
> - x = (id) CFCreateString3(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{__bridge_transfer to transfer}}
> + x = (id) CFMakeString3(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{CFBridgeRelease call to transfer}}
> + x = (id) CFCreateString3(); // expected-error {{requires a bridged cast}} expected-note {{__bridge to convert directly}} expected-note {{CFBridgeRelease call to transfer}}
> }
>
> Modified: cfe/trunk/test/SemaObjC/arc-type-conversion.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-type-conversion.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/arc-type-conversion.m (original)
> +++ cfe/trunk/test/SemaObjC/arc-type-conversion.m Tue Jan 31 17:42:37 2012
> @@ -14,13 +14,13 @@
> cvt((void*)arg); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} \
> // expected-error {{implicit conversion of C pointer type 'void *' to Objective-C pointer type 'id' requires a bridged cast}} \
> // expected-note 2 {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_retained to make an ARC object available as a +1 'void *'}} \
> - // expected-note {{use __bridge_transfer to transfer ownership of a +1 'void *' into ARC}}
> + // expected-note {{use CFBridgeRetain call to make an ARC object available as a +1 'void *'}} \
> + // expected-note {{use CFBridgeRelease call to transfer ownership of a +1 'void *' into ARC}}
> cvt(0);
> (void)(__strong id**)(0);
> return arg; // expected-error {{implicit conversion of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} \
> // expected-note {{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note {{use __bridge_retained to make an ARC object available as a +1 'void *'}}
> + // expected-note {{use CFBridgeRetain call to make an ARC object available as a +1 'void *'}}
> }
>
> void to_void(__strong id *sip, __weak id *wip,
>
> Modified: cfe/trunk/test/SemaObjC/arc-unbridged-cast.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc-unbridged-cast.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/arc-unbridged-cast.m (original)
> +++ cfe/trunk/test/SemaObjC/arc-unbridged-cast.m Tue Jan 31 17:42:37 2012
> @@ -35,15 +35,15 @@
> x = (id) (cond ? (void*) 0 : auditedString());
> x = (id) (cond ? (CFStringRef) @"help" : auditedString());
>
> - x = (id) unauditedString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? unauditedString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (void*) 0 : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (CFStringRef) @"help" : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> -
> - x = (id) auditedCreateString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? auditedCreateString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (void*) 0 : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (CFStringRef) @"help" : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> + x = (id) unauditedString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? unauditedString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (void*) 0 : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (CFStringRef) @"help" : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> +
> + x = (id) auditedCreateString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? auditedCreateString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (void*) 0 : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (CFStringRef) @"help" : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
>
> x = (id) [object property];
> x = (id) (cond ? [object property] : (void*) 0);
> @@ -80,7 +80,7 @@
> void testCFTaker(CFTaker *taker, id string) {
> [taker takeOrdinary: (CFStringRef) string];
> [taker takeVariadic: 1, (CFStringRef) string];
> - [taker takeConsumed: (CFStringRef) string]; // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + [taker takeConsumed: (CFStringRef) string]; // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> }
>
> void takeCFOrdinaryUnaudited(CFStringRef arg);
> @@ -93,27 +93,27 @@
> #pragma clang arc_cf_code_audited end
>
> void testTakerFunctions(id string) {
> - takeCFOrdinaryUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFVariadicUnaudited(1, (CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFConsumedUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFOrdinaryUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFVariadicUnaudited(1, (CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFConsumedUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> void (*taker)(CFStringRef) = 0;
> - taker((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + taker((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> takeCFOrdinaryAudited((CFStringRef) string);
> takeCFVariadicAudited(1, (CFStringRef) string);
> - takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> }
>
> void testTakerFunctions_parens(id string) {
> - takeCFOrdinaryUnaudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFVariadicUnaudited(1, ((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFConsumedUnaudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFOrdinaryUnaudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFVariadicUnaudited(1, ((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFConsumedUnaudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> void (*taker)(CFStringRef) = 0;
> - taker(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + taker(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> takeCFOrdinaryAudited(((CFStringRef) string));
> takeCFVariadicAudited(1, ((CFStringRef) string));
> - takeCFConsumedAudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFConsumedAudited(((CFStringRef) string)); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> }
>
> Modified: cfe/trunk/test/SemaObjC/arc.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/arc.m?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/arc.m (original)
> +++ cfe/trunk/test/SemaObjC/arc.m Tue Jan 31 17:42:37 2012
> @@ -263,8 +263,8 @@
> b = (vp == nil);
> b = (nil == vp);
>
> - b = (vp == op); // expected-error {{implicit conversion of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use __bridge_retained}}
> - b = (op == vp); // expected-error {{implicit conversion of C pointer type 'void *' to Objective-C pointer type 'id' requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use __bridge_transfer}}
> + b = (vp == op); // expected-error {{implicit conversion of Objective-C pointer type 'id' to C pointer type 'void *' requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use CFBridgeRetain call}}
> + b = (op == vp); // expected-error {{implicit conversion of C pointer type 'void *' to Objective-C pointer type 'id' requires a bridged cast}} expected-note {{use __bridge}} expected-note {{use CFBridgeRelease call}}
> }
>
> void test12(id collection) {
> @@ -404,10 +404,10 @@
> id x;
> x = (id) test19a; // expected-error {{bridged cast}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_transfer to transfer ownership of a +1 'struct Test19 *' into ARC}}
> + // expected-note{{use CFBridgeRelease call to transfer ownership of a +1 'struct Test19 *' into ARC}}
> x = (id) test19b; // expected-error {{bridged cast}} \
> // expected-note{{use __bridge to convert directly (no change in ownership)}} \
> - // expected-note{{use __bridge_transfer to transfer ownership of a +1 'struct Test19 *' into ARC}}
> + // expected-note{{use CFBridgeRelease call to transfer ownership of a +1 'struct Test19 *' into ARC}}
> }
>
> // rdar://problem/8951453
>
> Modified: cfe/trunk/test/SemaObjCXX/arc-unbridged-cast.mm
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/arc-unbridged-cast.mm?rev=149449&r1=149448&r2=149449&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjCXX/arc-unbridged-cast.mm (original)
> +++ cfe/trunk/test/SemaObjCXX/arc-unbridged-cast.mm Tue Jan 31 17:42:37 2012
> @@ -35,15 +35,15 @@
> x = (id) (cond ? (void*) 0 : auditedString());
> x = (id) (cond ? (CFStringRef) @"help" : auditedString());
>
> - x = (id) unauditedString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? unauditedString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (void*) 0 : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (CFStringRef) @"help" : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> -
> - x = (id) auditedCreateString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? auditedCreateString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (void*) 0 : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> - x = (id) (cond ? (CFStringRef) @"help" : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use __bridge_transfer to}}
> + x = (id) unauditedString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? unauditedString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (void*) 0 : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (CFStringRef) @"help" : unauditedString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> +
> + x = (id) auditedCreateString(); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? auditedCreateString() : (void*) 0); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (void*) 0 : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
> + x = (id) (cond ? (CFStringRef) @"help" : auditedCreateString()); // expected-error {{requires a bridged cast}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRelease call to}}
>
> x = (id) [object property];
> x = (id) (cond ? [object property] : (void*) 0);
> @@ -80,7 +80,7 @@
> void testCFTaker(CFTaker *taker, id string) {
> [taker takeOrdinary: (CFStringRef) string];
> [taker takeVariadic: 1, (CFStringRef) string];
> - [taker takeConsumed: (CFStringRef) string]; // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + [taker takeConsumed: (CFStringRef) string]; // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> }
>
> void takeCFOrdinaryUnaudited(CFStringRef arg);
> @@ -93,14 +93,14 @@
> #pragma clang arc_cf_code_audited end
>
> void testTakerFunctions(id string) {
> - takeCFOrdinaryUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFVariadicUnaudited(1, (CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> - takeCFConsumedUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFOrdinaryUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFVariadicUnaudited(1, (CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> + takeCFConsumedUnaudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> void (*taker)(CFStringRef) = 0;
> - taker((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + taker((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
>
> takeCFOrdinaryAudited((CFStringRef) string);
> takeCFVariadicAudited(1, (CFStringRef) string);
> - takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use __bridge_retained to}}
> + takeCFConsumedAudited((CFStringRef) string); // expected-error {{cast of Objective-C pointer type 'id' to C pointer type 'CFStringRef'}} expected-note {{use __bridge to}} expected-note {{use CFBridgeRetain call to}}
> }
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list