[clang] Remove rdar links; NFC

We have a new policy in place making links to private resources
something we try to avoid in source and test files. Normally, we'd
organically switch to the new policy rather than make a sweeping change
across a project. However, Clang is in a somewhat special circumstance
currently: recently, I've had several new contributors run into rdar
links around test code which their patch was changing the behavior of.
This turns out to be a surprisingly bad experience, especially for
newer folks, for a handful of reasons: not understanding what the link
is and feeling intimidated by it, wondering whether their changes are
actually breaking something important to a downstream in some way,
having to hunt down strangers not involved with the patch to impose on
them for help, accidental pressure from asking for potentially private
IP to be made public, etc. Because folks run into these links entirely
by chance (through fixing bugs or working on new features), there's not
really a set of problematic links to focus on -- all of the links have
basically the same potential for causing these problems. As a result,
this is an omnibus patch to remove all such links.

This was not a mechanical change; it was done by manually searching for
rdar, radar, radr, and other variants to find all the various
problematic links. From there, I tried to retain or reword the
surrounding comments so that we would lose as little context as
possible. However, because most links were just a plain link with no
supporting context, the majority of the changes are simple removals.

Differential Review: https://reviews.llvm.org/D158071

33 files changed, 78 insertions, 248 deletions

diff --git a/clang/test/ARCMT/GC-check-warn-nsalloc.m b/clang/test/ARCMT/GC-check-warn-nsalloc.m
index 26ead5f..1c33de5 100644
--- a/clang/test/ARCMT/GC-check-warn-nsalloc.m
+++ b/clang/test/ARCMT/GC-check-warn-nsalloc.m
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -arcmt-action=check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
 // RUN: %clang_cc1 -arcmt-action=check -no-ns-alloc-error -triple x86_64-apple-darwin10 -fobjc-gc-only -x objective-c++ %s 2>&1 | grep 'warning: \[rewriter\] call returns pointer to GC managed memory'
 // TODO: Investigate VerifyDiagnosticConsumer failures on these tests when using -verify.
-// rdar://10532541
 
 typedef unsigned NSUInteger;
 void *__strong NSAllocateCollectable(NSUInteger size, NSUInteger options);
diff --git a/clang/test/ARCMT/GC-no-finalize-removal.m b/clang/test/ARCMT/GC-no-finalize-removal.m
index a8db819..07a737c 100644
--- a/clang/test/ARCMT/GC-no-finalize-removal.m
+++ b/clang/test/ARCMT/GC-no-finalize-removal.m
@@ -77,7 +77,6 @@ __attribute__((objc_arc_weak_reference_unavailable))
 }
 @end
 
-// rdar://10532449
 @interface rdar10532449
 @property (assign) id assign_prop;
 @property (assign, readonly) id __strong strong_readonly_prop;
diff --git a/clang/test/ARCMT/GC-no-finalize-removal.m.result b/clang/test/ARCMT/GC-no-finalize-removal.m.result
index b563d19..a2105b3 100644
--- a/clang/test/ARCMT/GC-no-finalize-removal.m.result
+++ b/clang/test/ARCMT/GC-no-finalize-removal.m.result
@@ -85,7 +85,6 @@ __attribute__((objc_arc_weak_reference_unavailable))
 }
 @end
 
-// rdar://10532449
 @interface rdar10532449
 @property (strong) id assign_prop;
 @property (strong, readonly) id  strong_readonly_prop;
diff --git a/clang/test/ARCMT/GC.m b/clang/test/ARCMT/GC.m
index 2c9ea9c..97723e8 100644
--- a/clang/test/ARCMT/GC.m
+++ b/clang/test/ARCMT/GC.m
@@ -77,7 +77,6 @@ __attribute__((objc_arc_weak_reference_unavailable))
 }
 @end
 
-// rdar://10532449
 @interface rdar10532449
 @property (assign) id assign_prop;
 @property (assign, readonly) id __strong strong_readonly_prop;
diff --git a/clang/test/ARCMT/GC.m.result b/clang/test/ARCMT/GC.m.result
index 595ff23..b60b07a 100644
--- a/clang/test/ARCMT/GC.m.result
+++ b/clang/test/ARCMT/GC.m.result
@@ -72,7 +72,6 @@ __attribute__((objc_arc_weak_reference_unavailable))
 }
 @end
 
-// rdar://10532449
 @interface rdar10532449
 @property (strong) id assign_prop;
 @property (strong, readonly) id  strong_readonly_prop;
diff --git a/clang/test/ARCMT/check-with-pch.m b/clang/test/ARCMT/check-with-pch.m
index c20646b..c2fda3b 100644
--- a/clang/test/ARCMT/check-with-pch.m
+++ b/clang/test/ARCMT/check-with-pch.m
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -include-pch %t.pch -arcmt-action=check -verify -triple x86_64-apple-darwin10 -fblocks -Werror %s
 // REQUIRES: x86-registered-target
 
-// rdar://9601437
 @interface I9601437 {
   __unsafe_unretained id x;
 }
diff --git a/clang/test/ARCMT/checking.m b/clang/test/ARCMT/checking.m
index 0c69a7f..5bc456c 100644
--- a/clang/test/ARCMT/checking.m
+++ b/clang/test/ARCMT/checking.m
@@ -288,7 +288,6 @@ id test9(Test9 *v) {
   return [v init1];
 }
 
-// rdar://9491791
 void rdar9491791(int p) {
   switch (p) {
   case 3:;
@@ -302,12 +301,10 @@ void rdar9491791(int p) {
 
 #define RELEASE_MACRO(x) do { [x release]; } while(1)
 
-// rdar://9504750
 void rdar9504750(id p) {
   RELEASE_MACRO(p); // expected-error {{ARC forbids explicit message send of 'release'}} 
 }
 
-// rdar://8939557
 @interface TestReadonlyProperty : NSObject
 @property(assign,readonly) NSObject *value;
 @end
@@ -319,7 +316,6 @@ void rdar9504750(id p) {
 }
 @end
 
-// rdar://9601437
 @interface I9601437 {
   __unsafe_unretained id x;
 }
diff --git a/clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m b/clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
index 3e440d6..be49394 100644
--- a/clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
+++ b/clang/test/ARCMT/no-canceling-bridge-to-bridge-cast.m
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -arcmt-action=check -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -verify %s
-// rdar://10387088
 typedef const void * CFTypeRef;
 CFTypeRef CFBridgingRetain(id X);
 id CFBridgingRelease(CFTypeRef);
diff --git a/clang/test/ARCMT/nonobjc-to-objc-cast-2.m b/clang/test/ARCMT/nonobjc-to-objc-cast-2.m
index b8f562f..391c636 100644
--- a/clang/test/ARCMT/nonobjc-to-objc-cast-2.m
+++ b/clang/test/ARCMT/nonobjc-to-objc-cast-2.m
@@ -56,7 +56,6 @@ CFStringRef f3(void) {
 
 extern void NSLog(NSString *format, ...);
 
-// rdar://13192395
 void f4(NSString *s) {
   NSLog(@"%@", (CFStringRef)s); // expected-error {{cast of Objective-C pointer type 'NSString *' to C pointer type 'CFStringRef' (aka 'const struct __CFString *') requires a bridged cast}} \
     // expected-note{{use __bridge to convert directly (no change in ownership)}} \
diff --git a/clang/test/ARCMT/objcmt-arc-cf-annotations.m b/clang/test/ARCMT/objcmt-arc-cf-annotations.m
index 6b394e3..47c83ac 100644
--- a/clang/test/ARCMT/objcmt-arc-cf-annotations.m
+++ b/clang/test/ARCMT/objcmt-arc-cf-annotations.m
@@ -608,7 +608,6 @@ void f17(int x, CFTypeRef p) {
 }
 @end
 
-// <rdar://problem/6659160>
 int isFoo(char c);
 
 static void rdar_6659160(char *inkind, char *inname)
@@ -682,10 +681,10 @@ void pr3820_DeallocAfterRelease(void)
   // message sent to released object
 }
 
-// From <rdar://problem/6704930>.  The problem here is that 'length' binds to
-// '($0 - 1)' after '--length', but SimpleConstraintManager doesn't know how to
-// reason about '($0 - 1) > constant'.  As a temporary hack, we drop the value
-// of '($0 - 1)' and conjure a new symbol.
+// The problem here is that 'length' binds to '($0 - 1)' after '--length', but
+// SimpleConstraintManager doesn't know how to reason about
+// '($0 - 1) > constant'.  As a temporary hack, we drop the value of '($0 - 1)'
+// and conjure a new symbol.
 void rdar6704930(unsigned char *s, unsigned int length) {
   NSString* name = 0;
   if (s != 0) {
@@ -716,7 +715,6 @@ void rdar6704930(unsigned char *s, unsigned int length) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6833332>
 // One build of the analyzer accidentally stopped tracking the allocated
 // object after the 'retain'.
 //===----------------------------------------------------------------------===//
@@ -749,9 +747,8 @@ void rdar6704930(unsigned char *s, unsigned int length) {
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6257780> clang checker fails to catch use-after-release
+// clang checker fails to catch use-after-release
 //===----------------------------------------------------------------------===//
-
 int rdar_6257780_Case1(void) {
   NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
   NSArray *array = [NSArray array];
@@ -761,18 +758,16 @@ int rdar_6257780_Case1(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/10640253> Analyzer is confused about NSAutoreleasePool -allocWithZone:.
+// Analyzer is confused about NSAutoreleasePool -allocWithZone:.
 //===----------------------------------------------------------------------===//
-
 void rdar_10640253_autorelease_allocWithZone(void) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:(NSZone*)0] init];
     (void) pool;
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6866843> Checker should understand new/setObject:/release constructs
+// Checker should understand new/setObject:/release constructs
 //===----------------------------------------------------------------------===//
-
 void rdar_6866843(void) {
  NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
  NSMutableDictionary* dictionary = [[NSMutableDictionary alloc] init];
@@ -788,9 +783,8 @@ void rdar_6866843(void) {
 
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6877235> Classes typedef-ed to CF objects should get the same treatment as CF objects
+// Classes typedef-ed to CF objects should get the same treatment as CF objects
 //===----------------------------------------------------------------------===//
-
 typedef CFTypeRef OtherRef;
 
 @interface RDar6877235 : NSObject {}
@@ -808,10 +802,8 @@ typedef CFTypeRef OtherRef;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6320065> false positive - init method returns an object
-// owned by caller
+// false positive - init method returns an object owned by caller
 //===----------------------------------------------------------------------===//
-
 @interface RDar6320065 : NSObject {
   NSString *_foo;
 }
@@ -852,10 +844,8 @@ int RDar6320065_test(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7129086> -awakeAfterUsingCoder: returns an owned object 
-//  and claims the receiver
+// -awakeAfterUsingCoder: returns an owned object and claims the receiver
 //===----------------------------------------------------------------------===//
-
 @interface RDar7129086 : NSObject {} @end
 @implementation RDar7129086
 - (id)awakeAfterUsingCoder:(NSCoder *)aDecoder {
@@ -865,10 +855,8 @@ int RDar6320065_test(void) {
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6859457> [NSData dataWithBytesNoCopy] does not return a
-//  retained object
+// [NSData dataWithBytesNoCopy] does not return a retained object
 //===----------------------------------------------------------------------===//
-
 @interface RDar6859457 : NSObject {}
 - (NSString*) NoCopyString;
 - (NSString*) noCopyString;
@@ -909,7 +897,6 @@ static void PR4230_new(void)
 // Method name that has a null IdentifierInfo* for its first selector slot.
 // This test just makes sure that we handle it.
 //===----------------------------------------------------------------------===//
-
 @interface TestNullIdentifier
 @end
 
@@ -920,8 +907,7 @@ static void PR4230_new(void)
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6893565> don't flag leaks for return types that cannot be 
-//                          determined to be CF types
+// don't flag leaks for return types that cannot be determined to be CF types
 //===----------------------------------------------------------------------===//
 
 // We don't know if 'struct s6893565' represents a Core Foundation type, so
@@ -939,9 +925,8 @@ typedef struct s6893565* TD6893565;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6902710> clang: false positives w/QC and CoreImage methods
+// clang: false positives w/QC and CoreImage methods
 //===----------------------------------------------------------------------===//
-
 void rdar6902710(QCView *view, QCRenderer *renderer, CIContext *context,
                  NSString *str, CIImage *img, CGRect rect,
                  CIFormat form, CGColorSpaceRef cs) {
@@ -952,19 +937,15 @@ void rdar6902710(QCView *view, QCRenderer *renderer, CIContext *context,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6945561> -[CIContext createCGLayerWithSize:info:]
-//                           misinterpreted by clang scan-build
+// -[CIContext createCGLayerWithSize:info:] misinterpreted by clang scan-build
 //===----------------------------------------------------------------------===//
-
 void rdar6945561(CIContext *context, CGSize size, CFDictionaryRef d) {
   [context createCGLayerWithSize:size info:d]; // expected-warning{{leak}}
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6961230> add knowledge of IOKit functions to retain/release 
-//                          checker
+// Add knowledge of IOKit functions to retain/release checker.
 //===----------------------------------------------------------------------===//
-
 void IOBSDNameMatching_wrapper(mach_port_t mainPort, uint32_t options,  const char * bsdName) {  
   IOBSDNameMatching(mainPort, options, bsdName); // expected-warning{{leak}}
 }
@@ -1020,10 +1001,8 @@ void IOServiceAddMatchingNotification_wrapper(IONotificationPortRef notifyPort,
 //===----------------------------------------------------------------------===//
 // Test of handling objects whose references "escape" to containers.
 //===----------------------------------------------------------------------===//
-
 void CFDictionaryAddValue(CFMutableDictionaryRef, void *, void *);
 
-// <rdar://problem/6539791>
 void rdar_6539791(CFMutableDictionaryRef y, void* key, void* val_key) {
   CFMutableDictionaryRef x = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
   CFDictionaryAddValue(y, key, x);
@@ -1037,7 +1016,6 @@ void rdar_6539791(CFMutableDictionaryRef y, void* key, void* val_key) {
   }
 }
 
-// <rdar://problem/6560661>
 // Same issue, except with "AppendValue" functions.
 void rdar_6560661(CFMutableArrayRef x) {
   signed z = 1;
@@ -1049,7 +1027,6 @@ void rdar_6560661(CFMutableArrayRef x) {
   CFRelease(value); // no-warning
 }
 
-// <rdar://problem/7152619>
 // Same issue, excwept with "CFAttributeStringSetAttribute".
 void rdar_7152619(CFStringRef str) {
   CFAttributedStringRef string = CFAttributedStringCreate(kCFAllocatorDefault, str, 0);
@@ -1109,14 +1086,13 @@ void rdar_7184450_pos(CGContextRef myContext, CGFloat x, CGPoint myStartPoint,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7299394> clang false positive: retained instance passed to
-//                          thread in pthread_create marked as leak
+// clang false positive: retained instance passed to thread in pthread_create
+// marked as leak
 //
 // Until we have full IPA, the analyzer should stop tracking the reference
 // count of objects passed to pthread_create.
 //
 //===----------------------------------------------------------------------===//
-
 struct _opaque_pthread_t {};
 struct _opaque_pthread_attr_t {};
 typedef struct _opaque_pthread_t *__darwin_pthread_t;
@@ -1144,18 +1120,15 @@ void rdar_7299394_positive(pthread_attr_t *attr, pthread_t *thread) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/11282706> false positive with not understanding thread
-// local storage
+// false positive with not understanding thread local storage
 //===----------------------------------------------------------------------===//
-
 void rdar11282706(pthread_key_t key) {
   NSNumber *number = [[NSNumber alloc] initWithInt:5]; // no-warning
   pthread_setspecific(key, (void*) number);
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7283567> False leak associated with call to 
-//                          CVPixelBufferCreateWithBytes ()
+// False leak associated with call to CVPixelBufferCreateWithBytes ()
 //
 // According to the Core Video Reference (ADC), CVPixelBufferCreateWithBytes and
 // CVPixelBufferCreateWithPlanarBytes can release (via a callback) the
@@ -1163,7 +1136,6 @@ void rdar11282706(pthread_key_t key) {
 // the reference count for the objects passed for this argument.  This
 // could be made smarter.
 //===----------------------------------------------------------------------===//
-
 typedef int int32_t;
 typedef UInt32 FourCharCode;
 typedef FourCharCode OSType;
@@ -1254,8 +1226,7 @@ CVReturn rdar_7283567_2(CFAllocatorRef allocator, size_t width, size_t height,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7358899> False leak associated with 
-//  CGBitmapContextCreateWithData
+// False leak associated with CGBitmapContextCreateWithData
 //===----------------------------------------------------------------------===//
 typedef uint32_t CGBitmapInfo;
 typedef void (*CGBitmapContextReleaseDataCallback)(void *releaseInfo, void *data);
@@ -1280,14 +1251,13 @@ void rdar_7358899(void *data,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7265711> allow 'new', 'copy', 'alloc', 'init' prefix to
-//  start before '_' when determining Cocoa fundamental rule
+// Allow 'new', 'copy', 'alloc', 'init' prefix to start before '_' when
+// determining Cocoa fundamental rule.
 //
 // Previously the retain/release checker just skipped prefixes before the
 // first '_' entirely.  Now the checker honors the prefix if it results in a
 // recognizable naming convention (e.g., 'new', 'init').
 //===----------------------------------------------------------------------===//
-
 @interface RDar7265711 {}
 - (id) new_stuff;
 @end
@@ -1302,10 +1272,8 @@ void rdar7265711_b(RDar7265711 *x) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7306898> clang thinks [NSCursor dragCopyCursor] returns a
-//                          retained reference
+// clang thinks [NSCursor dragCopyCursor] returns a retained reference
 //===----------------------------------------------------------------------===//
-
 @interface NSCursor : NSObject
 + (NSCursor *)dragCopyCursor;
 @end
@@ -1318,10 +1286,9 @@ void rdar7306898(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7252064> sending 'release', 'retain', etc. to a Class
-// directly is not likely what the user intended
+// Sending 'release', 'retain', etc. to a Class directly is not likely what the
+// user intended.
 //===----------------------------------------------------------------------===//
-
 @interface RDar7252064 : NSObject @end
 void rdar7252064(void) {
   [RDar7252064 release]; // expected-warning{{The 'release' message should be sent to instances of class 'RDar7252064' and not the class directly}}
@@ -1462,10 +1429,9 @@ CFDateRef returnsRetainedCFDate(void)  {
 //===----------------------------------------------------------------------===//
 // Test that leaks post-dominated by "panic" functions are not reported.
 //
-// <rdar://problem/5905851> do not report a leak when post-dominated by a call
-// to a noreturn or panic function
+// Do not report a leak when post-dominated by a call to a noreturn or panic
+// function.
 //===----------------------------------------------------------------------===//
-
 void panic(void) __attribute__((noreturn));
 void panic_not_in_hardcoded_list(void) __attribute__((noreturn));
 
@@ -1493,9 +1459,9 @@ void test_panic_pos_2(int x) {
   if (x)
     panic();
   if (!x) {
-    // This showed up in <rdar://problem/7796563>, where we silently missed checking
-    // the function type for noreturn.  "panic()" is a hard-coded known panic function
-    // that isn't always noreturn.
+    // This showed up previously where we silently missed checking the function
+    // type for noreturn.  "panic()" is a hard-coded known panic function that
+    // isn't always noreturn.
     panic_not_in_hardcoded_list();
   }
 }
@@ -1542,17 +1508,14 @@ void test_blocks_1_indirect_retain_via_call(void) {
 }
 @end
 
-// <rdar://problem/8272168> - Correcly handle Class<...> in Cocoa Conventions
-// detector.
-
+// Correcly handle Class<...> in Cocoa Conventions detector.
 @protocol Prot_R8272168 @end
 Class <Prot_R8272168> GetAClassThatImplementsProt_R8272168(void);
 void r8272168(void) {
   GetAClassThatImplementsProt_R8272168();
 }
 
-// Test case for <rdar://problem/8356342>, which in the past triggered
-// a false positive.
+// Test case which in the past triggered a false positive.
 @interface RDar8356342
 - (NSDate*) rdar8356342:(NSDate *)inValue;
 @end
@@ -1570,8 +1533,7 @@ void r8272168(void) {
 }
 @end
 
-// <rdar://problem/8724287> - This test case previously crashed because
-// of a bug in BugReporter.
+// This test case previously crashed because of a bug in BugReporter.
 extern const void *CFDictionaryGetValue(CFDictionaryRef theDict, const void *key);
 typedef struct __CFError * CFErrorRef;
 extern const CFStringRef kCFErrorUnderlyingErrorKey;
@@ -1593,16 +1555,15 @@ static void rdar_8724287(CFErrorRef error)
     }
 }
 
-// <rdar://problem/9234108> - Make sure the model applies cf_consumed
-// correctly in argument positions besides the first.
+// Make sure the model applies cf_consumed correctly in argument positions
+// besides the first.
 extern void *CFStringCreate(void);
 extern void rdar_9234108_helper(void *key, void * CF_CONSUMED value);
 void rdar_9234108(void) {
   rdar_9234108_helper(0, CFStringCreate());
 }
 
-// <rdar://problem/9726279> - Make sure that objc_method_family works
-// to override naming conventions.
+// Make sure that objc_method_family works to override naming conventions.
 struct TwoDoubles {
   double one;
   double two;
@@ -1626,7 +1587,6 @@ void rdar9726279(void) {
   [value release];
 }
 
-// <rdar://problem/9732321>
 // Test camelcase support for CF conventions.  While Core Foundation APIs
 // don't use camel casing, other code is allowed to use it.
 CFArrayRef camelcase_create_1(void) {
@@ -1678,7 +1638,6 @@ CFArrayRef camel_copymachine(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
-// rdar://problem/8024350
 @protocol F18P
 - (id) clone;
 @end
@@ -1693,7 +1652,6 @@ CFArrayRef camel_copymachine(void) {
 }
 @end
 
-// Radar 6582778.
 void rdar6582778(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFTypeRef vals[] = { CFDateCreate(0, t) }; // expected-warning {{leak}}
@@ -1706,9 +1664,7 @@ void rdar6582778_2(void) {
   global = CFDateCreate(0, t); // no-warning
 }
 
-// <rdar://problem/10232019> - Test that objects passed to containers
-// are marked "escaped".
-
+// Test that objects passed to containers are marked "escaped".
 void rdar10232019(void) {
   NSMutableArray *array = [NSMutableArray array];
 
@@ -1731,7 +1687,6 @@ void rdar10232019_positive(void) {
 }
 
 // RetainCountChecker support for XPC.
-// <rdar://problem/9658496>
 typedef void * xpc_object_t;
 xpc_object_t _CFXPCCreateXPCObjectFromCFObject(CFTypeRef cf);
 void xpc_release(xpc_object_t object);
@@ -1766,7 +1721,6 @@ void rdar_10824732(void) {
 }
 
 // Stop tracking objects passed to functions, which take callbacks as parameters.
-// radar://10973977
 typedef int (*CloseCallback) (void *);
 void ReaderForIO(CloseCallback ioclose, void *ioctx);
 int IOClose(void *context);
@@ -1791,7 +1745,7 @@ int IOClose(void *context);
 }
 @end
 
-// Object escapes through a selector callback: radar://11398514
+// Object escapes through a selector callback
 extern id NSApp;
 @interface MySheetController
 - (id<SInS>)inputS;
@@ -2037,9 +1991,8 @@ static int Cond;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/13783514> xpc_connection_set_finalizer_f
+// xpc_connection_set_finalizer_f
 //===----------------------------------------------------------------------===//
-
 typedef xpc_object_t xpc_connection_t;
 typedef void (*xpc_finalizer_t)(void *value);
 void xpc_connection_set_context(xpc_connection_t connection, void *ctx);
diff --git a/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result b/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result
index 3372732..1e94129 100644
--- a/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result
+++ b/clang/test/ARCMT/objcmt-arc-cf-annotations.m.result
@@ -650,7 +650,6 @@ void f17(int x, CFTypeRef p) {
 }
 @end
 
-// <rdar://problem/6659160>
 int isFoo(char c);
 
 static void rdar_6659160(char *inkind, char *inname)
@@ -724,10 +723,10 @@ void pr3820_DeallocAfterRelease(void)
   // message sent to released object
 }
 
-// From <rdar://problem/6704930>.  The problem here is that 'length' binds to
-// '($0 - 1)' after '--length', but SimpleConstraintManager doesn't know how to
-// reason about '($0 - 1) > constant'.  As a temporary hack, we drop the value
-// of '($0 - 1)' and conjure a new symbol.
+// The problem here is that 'length' binds to '($0 - 1)' after '--length', but
+// SimpleConstraintManager doesn't know how to reason about
+// '($0 - 1) > constant'.  As a temporary hack, we drop the value of '($0 - 1)'
+// and conjure a new symbol.
 void rdar6704930(unsigned char *s, unsigned int length) {
   NSString* name = 0;
   if (s != 0) {
@@ -758,7 +757,6 @@ void rdar6704930(unsigned char *s, unsigned int length) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6833332>
 // One build of the analyzer accidentally stopped tracking the allocated
 // object after the 'retain'.
 //===----------------------------------------------------------------------===//
@@ -791,9 +789,8 @@ void rdar6704930(unsigned char *s, unsigned int length) {
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6257780> clang checker fails to catch use-after-release
+// clang checker fails to catch use-after-release
 //===----------------------------------------------------------------------===//
-
 int rdar_6257780_Case1(void) {
   NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
   NSArray *array = [NSArray array];
@@ -803,18 +800,16 @@ int rdar_6257780_Case1(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/10640253> Analyzer is confused about NSAutoreleasePool -allocWithZone:.
+// Analyzer is confused about NSAutoreleasePool -allocWithZone:.
 //===----------------------------------------------------------------------===//
-
 void rdar_10640253_autorelease_allocWithZone(void) {
     NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:(NSZone*)0] init];
     (void) pool;
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6866843> Checker should understand new/setObject:/release constructs
+// Checker should understand new/setObject:/release constructs
 //===----------------------------------------------------------------------===//
-
 void rdar_6866843(void) {
  NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
  NSMutableDictionary* dictionary = [[NSMutableDictionary alloc] init];
@@ -830,9 +825,8 @@ void rdar_6866843(void) {
 
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6877235> Classes typedef-ed to CF objects should get the same treatment as CF objects
+// Classes typedef-ed to CF objects should get the same treatment as CF objects
 //===----------------------------------------------------------------------===//
-
 typedef CFTypeRef OtherRef;
 
 @interface RDar6877235 : NSObject {}
@@ -850,10 +844,8 @@ typedef CFTypeRef OtherRef;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6320065> false positive - init method returns an object
-// owned by caller
+// false positive - init method returns an object owned by caller
 //===----------------------------------------------------------------------===//
-
 @interface RDar6320065 : NSObject {
   NSString *_foo;
 }
@@ -894,10 +886,8 @@ int RDar6320065_test(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7129086> -awakeAfterUsingCoder: returns an owned object 
-//  and claims the receiver
+// -awakeAfterUsingCoder: returns an owned object and claims the receiver
 //===----------------------------------------------------------------------===//
-
 @interface RDar7129086 : NSObject {} @end
 @implementation RDar7129086
 - (id)awakeAfterUsingCoder:(NSCoder *)aDecoder {
@@ -907,10 +897,8 @@ int RDar6320065_test(void) {
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6859457> [NSData dataWithBytesNoCopy] does not return a
-//  retained object
+// [NSData dataWithBytesNoCopy] does not return a retained object
 //===----------------------------------------------------------------------===//
-
 @interface RDar6859457 : NSObject {}
 - (NSString*) NoCopyString;
 - (NSString*) noCopyString;
@@ -951,7 +939,6 @@ static void PR4230_new(void)
 // Method name that has a null IdentifierInfo* for its first selector slot.
 // This test just makes sure that we handle it.
 //===----------------------------------------------------------------------===//
-
 @interface TestNullIdentifier
 @end
 
@@ -962,8 +949,7 @@ static void PR4230_new(void)
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6893565> don't flag leaks for return types that cannot be 
-//                          determined to be CF types
+// don't flag leaks for return types that cannot be determined to be CF types
 //===----------------------------------------------------------------------===//
 
 // We don't know if 'struct s6893565' represents a Core Foundation type, so
@@ -981,9 +967,8 @@ typedef struct s6893565* TD6893565;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6902710> clang: false positives w/QC and CoreImage methods
+// clang: false positives w/QC and CoreImage methods
 //===----------------------------------------------------------------------===//
-
 void rdar6902710(QCView *view, QCRenderer *renderer, CIContext *context,
                  NSString *str, CIImage *img, CGRect rect,
                  CIFormat form, CGColorSpaceRef cs) {
@@ -994,19 +979,15 @@ void rdar6902710(QCView *view, QCRenderer *renderer, CIContext *context,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6945561> -[CIContext createCGLayerWithSize:info:]
-//                           misinterpreted by clang scan-build
+// -[CIContext createCGLayerWithSize:info:] misinterpreted by clang scan-build
 //===----------------------------------------------------------------------===//
-
 void rdar6945561(CIContext *context, CGSize size, CFDictionaryRef d) {
   [context createCGLayerWithSize:size info:d]; // expected-warning{{leak}}
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/6961230> add knowledge of IOKit functions to retain/release 
-//                          checker
+// Add knowledge of IOKit functions to retain/release checker.
 //===----------------------------------------------------------------------===//
-
 void IOBSDNameMatching_wrapper(mach_port_t mainPort, uint32_t options,  const char * bsdName) {  
   IOBSDNameMatching(mainPort, options, bsdName); // expected-warning{{leak}}
 }
@@ -1062,10 +1043,8 @@ void IOServiceAddMatchingNotification_wrapper(IONotificationPortRef notifyPort,
 //===----------------------------------------------------------------------===//
 // Test of handling objects whose references "escape" to containers.
 //===----------------------------------------------------------------------===//
-
 void CFDictionaryAddValue(CFMutableDictionaryRef, void *, void *);
 
-// <rdar://problem/6539791>
 void rdar_6539791(CFMutableDictionaryRef y, void* key, void* val_key) {
   CFMutableDictionaryRef x = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
   CFDictionaryAddValue(y, key, x);
@@ -1079,7 +1058,6 @@ void rdar_6539791(CFMutableDictionaryRef y, void* key, void* val_key) {
   }
 }
 
-// <rdar://problem/6560661>
 // Same issue, except with "AppendValue" functions.
 void rdar_6560661(CFMutableArrayRef x) {
   signed z = 1;
@@ -1091,7 +1069,6 @@ void rdar_6560661(CFMutableArrayRef x) {
   CFRelease(value); // no-warning
 }
 
-// <rdar://problem/7152619>
 // Same issue, excwept with "CFAttributeStringSetAttribute".
 void rdar_7152619(CFStringRef str) {
   CFAttributedStringRef string = CFAttributedStringCreate(kCFAllocatorDefault, str, 0);
@@ -1151,14 +1128,13 @@ void rdar_7184450_pos(CGContextRef myContext, CGFloat x, CGPoint myStartPoint,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7299394> clang false positive: retained instance passed to
-//                          thread in pthread_create marked as leak
+// clang false positive: retained instance passed to thread in pthread_create
+// marked as leak
 //
 // Until we have full IPA, the analyzer should stop tracking the reference
 // count of objects passed to pthread_create.
 //
 //===----------------------------------------------------------------------===//
-
 struct _opaque_pthread_t {};
 struct _opaque_pthread_attr_t {};
 typedef struct _opaque_pthread_t *__darwin_pthread_t;
@@ -1186,18 +1162,15 @@ void rdar_7299394_positive(pthread_attr_t *attr, pthread_t *thread) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/11282706> false positive with not understanding thread
-// local storage
+// false positive with not understanding thread local storage
 //===----------------------------------------------------------------------===//
-
 void rdar11282706(pthread_key_t key) {
   NSNumber *number = [[NSNumber alloc] initWithInt:5]; // no-warning
   pthread_setspecific(key, (void*) number);
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7283567> False leak associated with call to 
-//                          CVPixelBufferCreateWithBytes ()
+// False leak associated with call to CVPixelBufferCreateWithBytes ()
 //
 // According to the Core Video Reference (ADC), CVPixelBufferCreateWithBytes and
 // CVPixelBufferCreateWithPlanarBytes can release (via a callback) the
@@ -1205,7 +1178,6 @@ void rdar11282706(pthread_key_t key) {
 // the reference count for the objects passed for this argument.  This
 // could be made smarter.
 //===----------------------------------------------------------------------===//
-
 typedef int int32_t;
 typedef UInt32 FourCharCode;
 typedef FourCharCode OSType;
@@ -1296,8 +1268,7 @@ CVReturn rdar_7283567_2(CFAllocatorRef allocator, size_t width, size_t height,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7358899> False leak associated with 
-//  CGBitmapContextCreateWithData
+// False leak associated with CGBitmapContextCreateWithData
 //===----------------------------------------------------------------------===//
 typedef uint32_t CGBitmapInfo;
 typedef void (*CGBitmapContextReleaseDataCallback)(void *releaseInfo, void *data);
@@ -1322,14 +1293,13 @@ void rdar_7358899(void *data,
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7265711> allow 'new', 'copy', 'alloc', 'init' prefix to
-//  start before '_' when determining Cocoa fundamental rule
+// Allow 'new', 'copy', 'alloc', 'init' prefix to start before '_' when
+// determining Cocoa fundamental rule.
 //
 // Previously the retain/release checker just skipped prefixes before the
 // first '_' entirely.  Now the checker honors the prefix if it results in a
 // recognizable naming convention (e.g., 'new', 'init').
 //===----------------------------------------------------------------------===//
-
 @interface RDar7265711 {}
 - (id) new_stuff;
 @end
@@ -1344,10 +1314,8 @@ void rdar7265711_b(RDar7265711 *x) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7306898> clang thinks [NSCursor dragCopyCursor] returns a
-//                          retained reference
+// clang thinks [NSCursor dragCopyCursor] returns a retained reference
 //===----------------------------------------------------------------------===//
-
 @interface NSCursor : NSObject
 + (NSCursor *)dragCopyCursor;
 @end
@@ -1360,10 +1328,9 @@ void rdar7306898(void) {
 }
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/7252064> sending 'release', 'retain', etc. to a Class
-// directly is not likely what the user intended
+// Sending 'release', 'retain', etc. to a Class directly is not likely what the
+// user intended.
 //===----------------------------------------------------------------------===//
-
 @interface RDar7252064 : NSObject @end
 void rdar7252064(void) {
   [RDar7252064 release]; // expected-warning{{The 'release' message should be sent to instances of class 'RDar7252064' and not the class directly}}
@@ -1504,10 +1471,9 @@ CFDateRef returnsRetainedCFDate(void)  {
 //===----------------------------------------------------------------------===//
 // Test that leaks post-dominated by "panic" functions are not reported.
 //
-// <rdar://problem/5905851> do not report a leak when post-dominated by a call
-// to a noreturn or panic function
+// Do not report a leak when post-dominated by a call to a noreturn or panic
+// function.
 //===----------------------------------------------------------------------===//
-
 void panic(void) __attribute__((noreturn));
 void panic_not_in_hardcoded_list(void) __attribute__((noreturn));
 
@@ -1535,9 +1501,9 @@ void test_panic_pos_2(int x) {
   if (x)
     panic();
   if (!x) {
-    // This showed up in <rdar://problem/7796563>, where we silently missed checking
-    // the function type for noreturn.  "panic()" is a hard-coded known panic function
-    // that isn't always noreturn.
+    // This showed up previously where we silently missed checking the function
+    // type for noreturn.  "panic()" is a hard-coded known panic function that
+    // isn't always noreturn.
     panic_not_in_hardcoded_list();
   }
 }
@@ -1584,17 +1550,14 @@ void test_blocks_1_indirect_retain_via_call(void) {
 }
 @end
 
-// <rdar://problem/8272168> - Correcly handle Class<...> in Cocoa Conventions
-// detector.
-
+// Correcly handle Class<...> in Cocoa Conventions detector.
 @protocol Prot_R8272168 @end
 Class <Prot_R8272168> GetAClassThatImplementsProt_R8272168(void);
 void r8272168(void) {
   GetAClassThatImplementsProt_R8272168();
 }
 
-// Test case for <rdar://problem/8356342>, which in the past triggered
-// a false positive.
+// Test case which in the past triggered a false positive.
 @interface RDar8356342
 - (NSDate*) rdar8356342:(NSDate *)inValue;
 @end
@@ -1612,8 +1575,7 @@ void r8272168(void) {
 }
 @end
 
-// <rdar://problem/8724287> - This test case previously crashed because
-// of a bug in BugReporter.
+// This test case previously crashed because of a bug in BugReporter.
 extern const void *CFDictionaryGetValue(CFDictionaryRef theDict, const void *key) CF_RETURNS_NOT_RETAINED;
 typedef struct __CFError * CFErrorRef;
 extern const CFStringRef kCFErrorUnderlyingErrorKey;
@@ -1635,8 +1597,8 @@ static void rdar_8724287(CFErrorRef error)
     }
 }
 
-// <rdar://problem/9234108> - Make sure the model applies cf_consumed
-// correctly in argument positions besides the first.
+// Make sure the model applies cf_consumed correctly in argument positions
+// besides the first.
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
@@ -1649,8 +1611,7 @@ void rdar_9234108(void) {
   rdar_9234108_helper(0, CFStringCreate());
 }
 
-// <rdar://problem/9726279> - Make sure that objc_method_family works
-// to override naming conventions.
+// Make sure that objc_method_family works to override naming conventions.
 struct TwoDoubles {
   double one;
   double two;
@@ -1674,7 +1635,6 @@ void rdar9726279(void) {
   [value release];
 }
 
-// <rdar://problem/9732321>
 // Test camelcase support for CF conventions.  While Core Foundation APIs
 // don't use camel casing, other code is allowed to use it.
 CFArrayRef camelcase_create_1(void) {
@@ -1726,7 +1686,6 @@ CFArrayRef camel_copymachine(void) {
   return CFArrayCreateMutable(0, 10, &kCFTypeArrayCallBacks); // expected-warning {{leak}}
 }
 
-// rdar://problem/8024350
 @protocol F18P
 - (id) clone;
 @end
@@ -1741,7 +1700,6 @@ CFArrayRef camel_copymachine(void) {
 }
 @end
 
-// Radar 6582778.
 void rdar6582778(void) {
   CFAbsoluteTime t = CFAbsoluteTimeGetCurrent();
   CFTypeRef vals[] = { CFDateCreate(0, t) }; // expected-warning {{leak}}
@@ -1754,9 +1712,7 @@ void rdar6582778_2(void) {
   global = CFDateCreate(0, t); // no-warning
 }
 
-// <rdar://problem/10232019> - Test that objects passed to containers
-// are marked "escaped".
-
+// Test that objects passed to containers are marked "escaped".
 void rdar10232019(void) {
   NSMutableArray *array = [NSMutableArray array];
 
@@ -1779,7 +1735,6 @@ void rdar10232019_positive(void) {
 }
 
 // RetainCountChecker support for XPC.
-// <rdar://problem/9658496>
 typedef void * xpc_object_t;
 xpc_object_t _CFXPCCreateXPCObjectFromCFObject(CFTypeRef cf);
 void xpc_release(xpc_object_t object);
@@ -1814,7 +1769,6 @@ void rdar_10824732(void) {
 }
 
 // Stop tracking objects passed to functions, which take callbacks as parameters.
-// radar://10973977
 typedef int (*CloseCallback) (void *);
 void ReaderForIO(CloseCallback ioclose, void *ioctx);
 int IOClose(void *context);
@@ -1839,7 +1793,7 @@ int IOClose(void *context);
 }
 @end
 
-// Object escapes through a selector callback: radar://11398514
+// Object escapes through a selector callback
 extern id NSApp;
 @interface MySheetController
 - (id<SInS>)inputS;
@@ -2085,9 +2039,8 @@ static int Cond;
 @end
 
 //===----------------------------------------------------------------------===//
-// <rdar://problem/13783514> xpc_connection_set_finalizer_f
+// xpc_connection_set_finalizer_f
 //===----------------------------------------------------------------------===//
-
 typedef xpc_object_t xpc_connection_t;
 typedef void (*xpc_finalizer_t)(void *value);
 void xpc_connection_set_context(xpc_connection_t connection, void *ctx);
diff --git a/clang/test/ARCMT/objcmt-atomic-property.m b/clang/test/ARCMT/objcmt-atomic-property.m
index 78ab3ec..00b5e09 100644
--- a/clang/test/ARCMT/objcmt-atomic-property.m
+++ b/clang/test/ARCMT/objcmt-atomic-property.m
@@ -177,7 +177,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -216,7 +215,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
diff --git a/clang/test/ARCMT/objcmt-atomic-property.m.result b/clang/test/ARCMT/objcmt-atomic-property.m.result
index 3378ff1..c829a7a 100644
--- a/clang/test/ARCMT/objcmt-atomic-property.m.result
+++ b/clang/test/ARCMT/objcmt-atomic-property.m.result
@@ -154,7 +154,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -191,7 +190,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
diff --git a/clang/test/ARCMT/objcmt-boxing.m b/clang/test/ARCMT/objcmt-boxing.m
index c4b6f42..07ee68d 100644
--- a/clang/test/ARCMT/objcmt-boxing.m
+++ b/clang/test/ARCMT/objcmt-boxing.m
@@ -100,7 +100,6 @@ void boxString() {
 
   static const char strarr[] = "coolbox";
   s = [NSString stringWithUTF8String:strarr];
-  // rdar://18080352
   const char *utf8Bytes = "blah";
   NSString *string1 = [NSString stringWithUTF8String:utf8Bytes];
   NSString *string2 = [[NSString alloc] initWithUTF8String:utf8Bytes];
diff --git a/clang/test/ARCMT/objcmt-boxing.m.result b/clang/test/ARCMT/objcmt-boxing.m.result
index 59fdb88..a60b359 100644
--- a/clang/test/ARCMT/objcmt-boxing.m.result
+++ b/clang/test/ARCMT/objcmt-boxing.m.result
@@ -100,7 +100,6 @@ void boxString() {
 
   static const char strarr[] = "coolbox";
   s = @(strarr);
-  // rdar://18080352
   const char *utf8Bytes = "blah";
   NSString *string1 = @(utf8Bytes);
   NSString *string2 = @(utf8Bytes);
diff --git a/clang/test/ARCMT/objcmt-migrate-all.m b/clang/test/ARCMT/objcmt-migrate-all.m
index 7ae898c..0aa6675 100644
--- a/clang/test/ARCMT/objcmt-migrate-all.m
+++ b/clang/test/ARCMT/objcmt-migrate-all.m
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -objcmt-migrate-all -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result
-// rdar://15396636
 
 #ifndef NS_RETURNS_INNER_POINTER // defined in iOS 6 for sure
 #define NS_RETURNS_INNER_POINTER __attribute__((objc_returns_inner_pointer))
@@ -109,7 +108,6 @@ CF_IMPLICIT_BRIDGING_DISABLED
 - (JSObjectRef*)JSObject2;
 @end
 
-// rdar://15044991
 typedef void *SecTrustRef;
 
 @interface NSURLProtectionSpace
diff --git a/clang/test/ARCMT/objcmt-migrate-all.m.result b/clang/test/ARCMT/objcmt-migrate-all.m.result
index d2ee4090..e097287 100644
--- a/clang/test/ARCMT/objcmt-migrate-all.m.result
+++ b/clang/test/ARCMT/objcmt-migrate-all.m.result
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -objcmt-migrate-all -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result
-// rdar://15396636
 
 #ifndef NS_RETURNS_INNER_POINTER // defined in iOS 6 for sure
 #define NS_RETURNS_INNER_POINTER __attribute__((objc_returns_inner_pointer))
@@ -109,7 +108,6 @@ CF_IMPLICIT_BRIDGING_DISABLED
 @property (nonatomic, readonly) JSObjectRef *JSObject2;
 @end
 
-// rdar://15044991
 typedef void *SecTrustRef;
 
 @interface NSURLProtectionSpace
diff --git a/clang/test/ARCMT/objcmt-ns-macros.m b/clang/test/ARCMT/objcmt-ns-macros.m
index 5bc390b..902e765 100644
--- a/clang/test/ARCMT/objcmt-ns-macros.m
+++ b/clang/test/ARCMT/objcmt-ns-macros.m
@@ -214,7 +214,6 @@ typedef enum {
   Random6
 } UIP8_3;
 
-// rdar://15200602
 #define NS_AVAILABLE_MAC(X)  __attribute__((availability(macosx,introduced=X)))
 #define NS_ENUM_AVAILABLE_MAC(X) __attribute__((availability(macosx,introduced=X)))
 
@@ -225,10 +224,8 @@ enum {
 } NS_ENUM_AVAILABLE_MAC(10.9);
 typedef NSInteger NSModalResponse NS_AVAILABLE_MAC(10.9);
 
-// rdar://15201056
 typedef NSUInteger FarFarAwayOptions;
 
-// rdar://15200915
 typedef NSUInteger FarAwayOptions;
 enum {
      NSWorkspaceLaunchAndPrint =                 0x00000002,
@@ -281,7 +278,6 @@ enum {
   FarFarAway2    = 1 << 2
 };
 
-// rdar://15200915
 typedef NS_OPTIONS(NSUInteger, NSWindowOcclusionState) {
     NSWindowOcclusionStateVisible = 1UL << 1,
 };
@@ -304,14 +300,12 @@ enum {
     NSWindowDocumentIconButton
 };
 
-// rdar://18262255
 typedef enum : NSUInteger {
    ThingOne,
    ThingTwo,
    ThingThree,
 } Thing;
 
-// rdar://18498539
 typedef enum {
     one = 1
 } NumericEnum;
@@ -331,7 +325,6 @@ typedef enum {
 
   NumericEnum4;
 
-// rdar://18532199
 enum
 {
   UI8one = 1
@@ -364,7 +357,6 @@ enum
 };
 typedef uint8_t UI8Type;
 
-// rdar://19352510
 typedef enum : NSInteger {zero} MyEnum;
 
 typedef enum : NSUInteger {two} MyEnumNSUInteger;
@@ -380,7 +372,6 @@ typedef enum : unsigned long long {
   ll4
 } MyEnumunsignedlonglong;
 
-// rdar://19994496
 typedef enum : int8_t {int8_one} MyOneEnum;
 
 typedef enum : int16_t {
diff --git a/clang/test/ARCMT/objcmt-ns-macros.m.result b/clang/test/ARCMT/objcmt-ns-macros.m.result
index 0107827..d4c0870 100644
--- a/clang/test/ARCMT/objcmt-ns-macros.m.result
+++ b/clang/test/ARCMT/objcmt-ns-macros.m.result
@@ -205,7 +205,6 @@ typedef NS_ENUM(unsigned int, UIP8_3) {
   Random6
 };
 
-// rdar://15200602
 #define NS_AVAILABLE_MAC(X)  __attribute__((availability(macosx,introduced=X)))
 #define NS_ENUM_AVAILABLE_MAC(X) __attribute__((availability(macosx,introduced=X)))
 
@@ -215,10 +214,8 @@ typedef NS_ENUM(NSInteger, NSModalResponse) {
     NSModalResponseContinue             = (-1002), 
 } NS_ENUM_AVAILABLE_MAC(10.9);
 
-// rdar://15201056
 typedef NSUInteger FarFarAwayOptions;
 
-// rdar://15200915
 typedef NS_OPTIONS(NSUInteger, FarAwayOptions) {
   FarAway1    = 1 << 1,
   FarAway2    = 1 << 2
@@ -266,7 +263,6 @@ enum {
   FarFarAway2    = 1 << 2
 };
 
-// rdar://15200915
 typedef NS_OPTIONS(NSUInteger, NSWindowOcclusionState) {
     NSWindowOcclusionStateVisible = 1UL << 1,
 };
@@ -287,14 +283,12 @@ typedef NS_ENUM(NSUInteger, NSSelectionDirection) {
 
 // standard window buttons
 
-// rdar://18262255
 typedef NS_ENUM(NSUInteger, Thing) {
    ThingOne,
    ThingTwo,
    ThingThree,
 };
 
-// rdar://18498539
 typedef NS_ENUM(unsigned int, NumericEnum) {
     one = 1
 };
@@ -311,7 +305,6 @@ typedef NS_OPTIONS(unsigned int, NumericEnum4) {
     Four = 4
 };
 
-// rdar://18532199
 typedef NS_ENUM(int8_t, MyEnumeratedType)
 {
   UI8one = 1
@@ -340,7 +333,6 @@ typedef NS_ENUM(uint8_t, UI8Type)
         UIU8one = 1
 };
 
-// rdar://19352510
 typedef NS_ENUM(NSInteger, MyEnum) {zero};
 
 typedef NS_ENUM(NSUInteger, MyEnumNSUInteger) {two};
@@ -356,7 +348,6 @@ typedef NS_ENUM(unsigned long long, MyEnumunsignedlonglong) {
   ll4
 };
 
-// rdar://19994496
 typedef NS_ENUM(int8_t, MyOneEnum) {int8_one};
 
 typedef NS_ENUM(int16_t, Myint16_tEnum) {
diff --git a/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m b/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m
index 57b2041..55a116c 100644
--- a/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m
+++ b/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m
@@ -8,7 +8,6 @@
 #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER
 #define DEPRECATED  __attribute__((deprecated)) 
 
-// rdar://15442742
 #if TARGET_OS_IPHONE
   #define NS_NONATOMIC_IOSONLY nonatomic
 #else
@@ -184,7 +183,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -223,7 +221,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
diff --git a/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m.result b/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m.result
index 8e9e3a0..512deb1 100644
--- a/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m.result
+++ b/clang/test/ARCMT/objcmt-ns-nonatomic-iosonly.m.result
@@ -8,7 +8,6 @@
 #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER
 #define DEPRECATED  __attribute__((deprecated)) 
 
-// rdar://15442742
 #if TARGET_OS_IPHONE
   #define NS_NONATOMIC_IOSONLY nonatomic
 #else
@@ -161,7 +160,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -198,7 +196,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
diff --git a/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m b/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m
index bff7d80..853d16d 100644
--- a/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m
+++ b/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m
@@ -108,7 +108,6 @@ CF_IMPLICIT_BRIDGING_DISABLED
 - (JSObjectRef*)JSObject2;
 @end
 
-// rdar://15044991
 typedef void *SecTrustRef;
 
 @interface NSURLProtectionSpace
diff --git a/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m.result b/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m.result
index 8048e06..c89c91e 100644
--- a/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m.result
+++ b/clang/test/ARCMT/objcmt-ns-returns-inner-pointer.m.result
@@ -108,7 +108,6 @@ CF_IMPLICIT_BRIDGING_DISABLED
 - (JSObjectRef*)JSObject2 NS_RETURNS_INNER_POINTER;
 @end
 
-// rdar://15044991
 typedef void *SecTrustRef;
 
 @interface NSURLProtectionSpace
diff --git a/clang/test/ARCMT/objcmt-property-availability.m b/clang/test/ARCMT/objcmt-property-availability.m
index d499221..37ba74f 100644
--- a/clang/test/ARCMT/objcmt-property-availability.m
+++ b/clang/test/ARCMT/objcmt-property-availability.m
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1  -objcmt-migrate-readwrite-property -objcmt-migrate-readonly-property -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result
-// rdar://15300059
 
 
 #define __NSi_7_0 introduced=7.0
diff --git a/clang/test/ARCMT/objcmt-property-availability.m.result b/clang/test/ARCMT/objcmt-property-availability.m.result
index a5a45e3..3a212ac 100644
--- a/clang/test/ARCMT/objcmt-property-availability.m.result
+++ b/clang/test/ARCMT/objcmt-property-availability.m.result
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1  -objcmt-migrate-readwrite-property -objcmt-migrate-readonly-property -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c -fobjc-runtime-has-weak -fobjc-arc %s.result
-// rdar://15300059
 
 
 #define __NSi_7_0 introduced=7.0
diff --git a/clang/test/ARCMT/objcmt-property-dot-syntax.m b/clang/test/ARCMT/objcmt-property-dot-syntax.m
index 00426dc..ec75b51 100644
--- a/clang/test/ARCMT/objcmt-property-dot-syntax.m
+++ b/clang/test/ARCMT/objcmt-property-dot-syntax.m
@@ -5,12 +5,10 @@
 
 @class NSString;
 
-// rdar://19140267
 @protocol NSObject
 @property (readonly, copy) NSString *description;
 @end
 
-// rdar://18498572
 @interface NSObject <NSObject> @end
 
 @interface P : NSObject
@@ -47,7 +45,6 @@ P* fun(void);
 - (NSString *)description { return [super description]; }
 @end
 
-// rdar://19140267
 @interface Sub : P
 @end
 
@@ -78,7 +75,6 @@ id testRdar19038838(Rdar19038838 *obj) {
   return [obj newItem];
 }
 
-// rdar://19381786
 @interface rdar19381786 : NSObject
 {
   rdar19381786* obj;
@@ -99,7 +95,6 @@ id testRdar19038838(Rdar19038838 *obj) {
 }
 @end
 
-// rdar://19140114
 int NSOnState;
 int ArrNSOnState[4];
 @interface rdar19140114 : NSObject
diff --git a/clang/test/ARCMT/objcmt-property-dot-syntax.m.result b/clang/test/ARCMT/objcmt-property-dot-syntax.m.result
index 43d86a8..5153b0e 100644
--- a/clang/test/ARCMT/objcmt-property-dot-syntax.m.result
+++ b/clang/test/ARCMT/objcmt-property-dot-syntax.m.result
@@ -5,12 +5,10 @@
 
 @class NSString;
 
-// rdar://19140267
 @protocol NSObject
 @property (readonly, copy) NSString *description;
 @end
 
-// rdar://18498572
 @interface NSObject <NSObject> @end
 
 @interface P : NSObject
@@ -47,7 +45,6 @@ P* fun(void);
 - (NSString *)description { return super.description; }
 @end
 
-// rdar://19140267
 @interface Sub : P
 @end
 
@@ -78,7 +75,6 @@ id testRdar19038838(Rdar19038838 *obj) {
   return obj.newItem;
 }
 
-// rdar://19381786
 @interface rdar19381786 : NSObject
 {
   rdar19381786* obj;
@@ -99,7 +95,6 @@ id testRdar19038838(Rdar19038838 *obj) {
 }
 @end
 
-// rdar://19140114
 int NSOnState;
 int ArrNSOnState[4];
 @interface rdar19140114 : NSObject
diff --git a/clang/test/ARCMT/objcmt-property.m b/clang/test/ARCMT/objcmt-property.m
index 1ea4109..f2b722e 100644
--- a/clang/test/ARCMT/objcmt-property.m
+++ b/clang/test/ARCMT/objcmt-property.m
@@ -70,7 +70,6 @@ typedef char BOOL;
 
 - (id) dataSource;
 
-// rdar://15509831
 - (id)delegate;
 
 - (id)xxxdelegateYYY;
@@ -180,7 +179,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -219,7 +217,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
@@ -231,7 +228,6 @@ DEPRECATED
 - (void) setMyFuncptr : (id (*)(id, NSArray *, NSMutableDictionary *)) bl;
 @end
 
-// rdar://15231241
 @interface rdar15231241
 @property (nonatomic, readonly) double Ddelegate;
 @property (nonatomic, readonly) float Fdelegate;
@@ -239,7 +235,6 @@ DEPRECATED
 @property (nonatomic, readonly) BOOL Bdelegate;
 @end
 
-// rdar://19372798
 @protocol NSObject @end
 @protocol MyProtocol <NSObject>
 - (id)readonlyProperty;
diff --git a/clang/test/ARCMT/objcmt-property.m.result b/clang/test/ARCMT/objcmt-property.m.result
index 58f8ce2..610f027 100644
--- a/clang/test/ARCMT/objcmt-property.m.result
+++ b/clang/test/ARCMT/objcmt-property.m.result
@@ -61,7 +61,6 @@ typedef char BOOL;
 
 @property (nonatomic, assign) id dataSource;
 
-// rdar://15509831
 @property (nonatomic, readonly, assign) id delegate;
 
 @property (nonatomic, assign) id xxxdelegateYYY;
@@ -157,7 +156,6 @@ DEPRECATED
 - (void)setXxxdelegateYYY:(id)delegate DEPRECATED;
 @end
 
-// rdar://14987909
 #define NS_AVAILABLE __attribute__((availability(macosx,introduced=10.0)))
 #define NORETURN __attribute__((noreturn))
 #define ALIGNED __attribute__((aligned(16)))
@@ -194,7 +192,6 @@ DEPRECATED
 
 @end
 
-// rdar://15082818
 @class NSMutableDictionary;
 
 @interface NSArray
@@ -204,7 +201,6 @@ DEPRECATED
 @property (nonatomic) id (*MyFuncptr)(id, NSArray *, NSMutableDictionary *);
 @end
 
-// rdar://15231241
 @interface rdar15231241
 @property (nonatomic, readonly) double Ddelegate;
 @property (nonatomic, readonly) float Fdelegate;
@@ -212,7 +208,6 @@ DEPRECATED
 @property (nonatomic, readonly) BOOL Bdelegate;
 @end
 
-// rdar://19372798
 @protocol NSObject @end
 @protocol MyProtocol <NSObject>
 @property (nonatomic, readonly, strong) id readonlyProperty;
diff --git a/clang/test/ARCMT/objcmt-protocol-conformance.m b/clang/test/ARCMT/objcmt-protocol-conformance.m
index f4c8f51..e9bb4ac 100644
--- a/clang/test/ARCMT/objcmt-protocol-conformance.m
+++ b/clang/test/ARCMT/objcmt-protocol-conformance.m
@@ -112,7 +112,6 @@
 @implementation Test7
 @end
 
-// rdar://15515206
 @interface BTLEBrowser
 @end
 
diff --git a/clang/test/ARCMT/objcmt-protocol-conformance.m.result b/clang/test/ARCMT/objcmt-protocol-conformance.m.result
index 0322ab8..9875325 100644
--- a/clang/test/ARCMT/objcmt-protocol-conformance.m.result
+++ b/clang/test/ARCMT/objcmt-protocol-conformance.m.result
@@ -112,7 +112,6 @@
 @implementation Test7
 @end
 
-// rdar://15515206
 @interface BTLEBrowser
 @end
 
diff --git a/clang/test/ARCMT/objcmt-undefined-ns-macros.m b/clang/test/ARCMT/objcmt-undefined-ns-macros.m
index 2e1fa51..473b495 100644
--- a/clang/test/ARCMT/objcmt-undefined-ns-macros.m
+++ b/clang/test/ARCMT/objcmt-undefined-ns-macros.m
@@ -2,8 +2,6 @@
 // RUN: %clang_cc1 -fmodules -objcmt-migrate-ns-macros -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 
-// rdar://18498550
-
 typedef long NSInteger;
 enum {
     UIViewNone         = 0x0,
diff --git a/clang/test/ARCMT/objcmt-undefined-ns-macros.m.result b/clang/test/ARCMT/objcmt-undefined-ns-macros.m.result
index 30277ac..a6942e2 100644
--- a/clang/test/ARCMT/objcmt-undefined-ns-macros.m.result
+++ b/clang/test/ARCMT/objcmt-undefined-ns-macros.m.result
@@ -2,8 +2,6 @@
 // RUN: %clang_cc1 -fmodules -objcmt-migrate-ns-macros -mt-migrate-directory %t %s -x objective-c -fobjc-runtime-has-weak -fobjc-arc -triple x86_64-apple-darwin11
 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result
 
-// rdar://18498550
-
 typedef long NSInteger;
 #ifndef NS_ENUM
 @import Foundation;