Improve on the diagnostic in my last patch and change warning

to error. rdar://18768214.

llvm-svn: 220740

2 files changed, 3 insertions, 3 deletions

diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index d059e870bbb..a2e7b59e15d 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -4461,9 +4461,9 @@ def warn_arc_object_memaccess : Warning<
   "ownership-qualified type %2">, InGroup<ARCNonPodMemAccess>;
   
 def warn_arc_consumed_object_released : Warning<
-  "__bridge cast of collection literal of type %1 to \"bridgeable\" C "
+  "__bridge cast of collection literal of type %1 to bridgeable "
   "type %0 causes early release of the collection">,
-  InGroup<ARCBridgeCastRelease>;
+  InGroup<ARCBridgeCastRelease>, DefaultError;
 
 let CategoryName = "ARC and @properties" in {
 
diff --git a/clang/test/SemaObjC/arc-cfbridge-warning.m b/clang/test/SemaObjC/arc-cfbridge-warning.m
index 142983f1dec..1077fb07ef4 100644
--- a/clang/test/SemaObjC/arc-cfbridge-warning.m
+++ b/clang/test/SemaObjC/arc-cfbridge-warning.m
@@ -37,5 +37,5 @@ static CFStringRef _s;
 
 CFArrayRef _array()
 {
-    return (__bridge CFArrayRef)@[(__bridge NSString *)_s]; // expected-warning {{__bridge cast of collection literal of type 'NSArray *' to "bridgeable" C type 'CFArrayRef' (aka 'const struct __CFArray *') causes early release of the collection}}
+    return (__bridge CFArrayRef)@[(__bridge NSString *)_s]; // expected-error {{__bridge cast of collection literal of type 'NSArray *' to bridgeable type 'CFArrayRef' (aka 'const struct __CFArray *') causes early release of the collection}}
 }