Author: kremenek
Date: Thu Feb 2 23:01:51 2012
New Revision: 149670
URL: http://llvm.org/viewvc/llvm-project?rev=149670&view=rev
Log:
Further downgrade -Warc-bridge-casts-disallowed-in-nonarc to a warning (not
mapped to an error). We can consider mapping it back to an error later.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
cfe/trunk/test/SemaObjC/illegal-nonarc-bridged-cast.m
Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=149670&r1=149669&r2=149670&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Thu Feb 2 23:01:51
2012
@@ -330,10 +330,10 @@
let CategoryName = "ARC Parse Issue" in {
def err_arc_bridge_retain : Error<
"unknown cast annotation __bridge_retain; did you mean __bridge_retained?">;
+// To be default mapped to an error later.
def err_arc_bridge_cast_nonarc : Warning<
"'%0' casts are only allowed when using ARC">,
- InGroup<DiagGroup<"arc-bridge-casts-disallowed-in-nonarc">>,
- DefaultError;
+ InGroup<DiagGroup<"arc-bridge-casts-disallowed-in-nonarc">>;
}
def err_objc_illegal_visibility_spec : Error<
Modified: cfe/trunk/test/SemaObjC/illegal-nonarc-bridged-cast.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/illegal-nonarc-bridged-cast.m?rev=149670&r1=149669&r2=149670&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/illegal-nonarc-bridged-cast.m (original)
+++ cfe/trunk/test/SemaObjC/illegal-nonarc-bridged-cast.m Thu Feb 2 23:01:51
2012
@@ -16,19 +16,19 @@
NSString *CreateNSString();
void from_cf() {
- id obj1 = (__bridge_transfer id)CFCreateSomething(); // expected-error
{{'__bridge_transfer' casts are only allowed when using ARC}}
- id obj2 = (__bridge_transfer NSString*)CFCreateString(); // expected-error
{{'__bridge_transfer' casts are only allowed when using ARC}}
- (__bridge int*)CFCreateSomething(); // expected-error {{'__bridge' casts
are only allowed when using ARC}} \
+ id obj1 = (__bridge_transfer id)CFCreateSomething(); // expected-warning
{{'__bridge_transfer' casts are only allowed when using ARC}}
+ id obj2 = (__bridge_transfer NSString*)CFCreateString(); // expected-warning
{{'__bridge_transfer' casts are only allowed when using ARC}}
+ (__bridge int*)CFCreateSomething(); // expected-warning {{'__bridge' casts
are only allowed when using ARC}} \
// expected-warning {{expression result
unused}}
- id obj3 = (__bridge id)CFGetSomething(); // expected-error {{'__bridge'
casts are only allowed when using ARC}}
- id obj4 = (__bridge NSString*)CFGetString(); // expected-error {{'__bridge'
casts are only allowed when using ARC}}
+ id obj3 = (__bridge id)CFGetSomething(); // expected-warning {{'__bridge'
casts are only allowed when using ARC}}
+ id obj4 = (__bridge NSString*)CFGetString(); // expected-warning
{{'__bridge' casts are only allowed when using ARC}}
}
void to_cf(id obj) {
- CFTypeRef cf1 = (__bridge_retained CFTypeRef)CreateSomething(); //
expected-error {{'__bridge_retained' casts are only allowed when using ARC}}
- CFStringRef cf2 = (__bridge_retained CFStringRef)CreateNSString(); //
expected-error {{'__bridge_retained' casts are only allowed when using ARC}}
- CFTypeRef cf3 = (__bridge CFTypeRef)CreateSomething(); // expected-error
{{'__bridge' casts are only allowed when using ARC}}
- CFStringRef cf4 = (__bridge CFStringRef)CreateNSString(); // expected-error
{{'__bridge' casts are only allowed when using ARC}}
+ CFTypeRef cf1 = (__bridge_retained CFTypeRef)CreateSomething(); //
expected-warning {{'__bridge_retained' casts are only allowed when using ARC}}
+ CFStringRef cf2 = (__bridge_retained CFStringRef)CreateNSString(); //
expected-warning {{'__bridge_retained' casts are only allowed when using ARC}}
+ CFTypeRef cf3 = (__bridge CFTypeRef)CreateSomething(); // expected-warning
{{'__bridge' casts are only allowed when using ARC}}
+ CFStringRef cf4 = (__bridge CFStringRef)CreateNSString(); //
expected-warning {{'__bridge' casts are only allowed when using ARC}}
}
void fixits() {
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
