1 files changed, 15 insertions, 15 deletions
diff --git a/test/ARCMT/nonobjc-to-objc-cast.m.result b/test/ARCMT/nonobjc-to-objc-cast.m.result
index b50a948e27..0a3b2bb526 100644
--- a/test/ARCMT/nonobjc-to-objc-cast.m.result
+++ b/test/ARCMT/nonobjc-to-objc-cast.m.result
@@ -28,9 +28,9 @@ void f(BOOL b, id p) {
   str = (NSString *)p; // no change.
 
   CFUUIDRef   _uuid;
-  NSString *_uuidString = (__bridge_transfer NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid);
-  _uuidString = (__bridge_transfer NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid);
-  _uuidString = (__bridge_transfer NSString *)(CFRetain(_uuid));
+  NSString *_uuidString = (NSString *)CFBridgingRelease(CFUUIDCreateString(kCFAllocatorDefault, _uuid));
+  _uuidString = (NSString *)CFBridgingRelease(CFUUIDCreateString(kCFAllocatorDefault, _uuid));
+  _uuidString = CFBridgingRelease(CFRetain(_uuid));
 }
 
 @implementation NSString (StrExt)
@@ -47,16 +47,16 @@ void f2(NSString *s) {
   CFStringRef ref = (__bridge CFStringRef)([s string]);
   ref = (__bridge CFStringRef)[s string];
   ref = (__bridge CFStringRef)(s.string);
-  ref = (__bridge_retained CFStringRef)([NSString new]);
-  ref = (__bridge_retained CFStringRef)([s newString]);
-  ref = (__bridge_retained CFStringRef)[NSString new];
-  ref = (__bridge_retained CFStringRef)([[NSString alloc] init]);
-  ref = (__bridge_retained CFStringRef)([s string]);
-  ref = (__bridge_retained CFStringRef)[s string];
-  ref = (__bridge_retained CFTypeRef)([s string]);
-  ref = (__bridge_retained CFTypeRef)(s);
-  ref = (__bridge_retained CFStringRef)(s);
-
-  consumeParam((__bridge_retained CFStringRef)s);
-  consumeParam((__bridge_retained CFStringRef)(s));
+  ref = CFBridgingRetain([NSString new]);
+  ref = CFBridgingRetain([s newString]);
+  ref = (CFStringRef)CFBridgingRetain([NSString new]);
+  ref = CFBridgingRetain([[NSString alloc] init]);
+  ref = CFBridgingRetain([s string]);
+  ref = (CFStringRef)CFBridgingRetain([s string]);
+  ref = CFBridgingRetain([s string]);
+  ref = CFBridgingRetain(s);
+  ref = CFBridgingRetain(s);
+
+  consumeParam((CFStringRef)CFBridgingRetain(s));
+  consumeParam(CFBridgingRetain(s));
 }