[arcmt] Always add '__bridge' cast when 'self' is cast to a C pointer. rdar://9644061

llvm-svn: 133480

2 files changed, 16 insertions, 4 deletions

diff --git a/clang/test/ARCMT/nonobjc-to-objc-cast.m b/clang/test/ARCMT/nonobjc-to-objc-cast.m
index 4ca47f2259f..4e1e293efba 100644
--- a/clang/test/ARCMT/nonobjc-to-objc-cast.m
+++ b/clang/test/ARCMT/nonobjc-to-objc-cast.m
@@ -24,9 +24,15 @@ void f(BOOL b, id p) {
   str = (NSString *)(b ? kUTTypeRTF : kUTTypePlainText);
   str = (NSString *)p; // no change.
 
-  // FIXME: Add objc -> c examples that we can handle.
-
   CFUUIDRef   _uuid;
   NSString *_uuidString = (NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid);
   _uuidString = [(NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid) autorelease];
 }
+
+@implementation NSString (StrExt)
+- (NSString *)stringEscapedAsURI {
+  CFStringRef str = (CFStringRef)self;
+  CFStringRef str2 = self;
+  return self;
+}
+@end
diff --git a/clang/test/ARCMT/nonobjc-to-objc-cast.m.result b/clang/test/ARCMT/nonobjc-to-objc-cast.m.result
index f7127b71927..53dde7553d6 100644
--- a/clang/test/ARCMT/nonobjc-to-objc-cast.m.result
+++ b/clang/test/ARCMT/nonobjc-to-objc-cast.m.result
@@ -24,9 +24,15 @@ void f(BOOL b, id p) {
   str = (__bridge NSString *)(b ? kUTTypeRTF : kUTTypePlainText);
   str = (NSString *)p; // no change.
 
-  // FIXME: Add objc -> c examples that we can handle.
-
   CFUUIDRef   _uuid;
   NSString *_uuidString = (__bridge_transfer NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid);
   _uuidString = (__bridge_transfer NSString *)CFUUIDCreateString(kCFAllocatorDefault, _uuid);
 }
+
+@implementation NSString (StrExt)
+- (NSString *)stringEscapedAsURI {
+  CFStringRef str = (__bridge CFStringRef)self;
+  CFStringRef str2 = (__bridge CFStringRef)(self);
+  return self;
+}
+@end