[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

98 files changed, 12 insertions, 144 deletions

diff --git a/clang/test/Rewriter/blockcast3.mm b/clang/test/Rewriter/blockcast3.mm
index 1d82609..54ec0f5 100644
--- a/clang/test/Rewriter/blockcast3.mm
+++ b/clang/test/Rewriter/blockcast3.mm
@@ -3,7 +3,6 @@
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-modern-rw.cpp
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-modern-rw.cpp %s
-// radar 7607781
 
 typedef struct {
 	int a;
diff --git a/clang/test/Rewriter/blockstruct.m b/clang/test/Rewriter/blockstruct.m
index 477afb4..988e1bf 100644
--- a/clang/test/Rewriter/blockstruct.m
+++ b/clang/test/Rewriter/blockstruct.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://8918702
 
 typedef void (^b_t)(void);
 void a(b_t work) { }
diff --git a/clang/test/Rewriter/crash.m b/clang/test/Rewriter/crash.m
index 55d7a03..c8d5d78 100644
--- a/clang/test/Rewriter/crash.m
+++ b/clang/test/Rewriter/crash.m
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 -o - %s
-// rdar://5950938
 @interface NSArray {}
 + (id)arrayWithObjects:(id)firstObj, ...;
 @end
@@ -12,7 +11,6 @@ int main(void) {
     return 0;
 }
 
-// rdar://6291588
 @protocol A
 @end
 
diff --git a/clang/test/Rewriter/inner-block-helper-funcs.mm b/clang/test/Rewriter/inner-block-helper-funcs.mm
index 92ef7e9..6bbfc5f 100644
--- a/clang/test/Rewriter/inner-block-helper-funcs.mm
+++ b/clang/test/Rewriter/inner-block-helper-funcs.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: FileCheck  -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
-// rdar://9846759
 
 typedef void (^dispatch_block_t)(void);
 
diff --git a/clang/test/Rewriter/line-generation-test.m b/clang/test/Rewriter/line-generation-test.m
index 5193775..063244f 100644
--- a/clang/test/Rewriter/line-generation-test.m
+++ b/clang/test/Rewriter/line-generation-test.m
@@ -3,7 +3,6 @@
 // RUN: FileCheck  -check-prefix CHECK-LINE --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fms-extensions -rewrite-objc %t.mm -o %t-rwnog.cpp
 // RUN: FileCheck  -check-prefix CHECK-NOLINE --input-file=%t-rwnog.cpp %s
-// rdar://13138170
 
 __attribute__((objc_root_class)) @interface MyObject {
 @public
@@ -33,8 +32,8 @@ MyObject * foo ()
 	return p->_isTickledPink;
 }
 
-// CHECK-LINE: #line 22
-// CHECK-LINE: #line 28
-// CHECK-NOLINE-NOT: #line 22
-// CHECK-NOLINE-NOT: #line 28
+// CHECK-LINE: #line 21
+// CHECK-LINE: #line 27
+// CHECK-NOLINE-NOT: #line 21
+// CHECK-NOLINE-NOT: #line 27
 
diff --git a/clang/test/Rewriter/missing-dllimport.c b/clang/test/Rewriter/missing-dllimport.c
index 9702c97..33e4701 100644
--- a/clang/test/Rewriter/missing-dllimport.c
+++ b/clang/test/Rewriter/missing-dllimport.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -triple i686-pc-win32 -fms-extensions -verify %s
 
 // Do not report that 'foo()' is redeclared without dllimport attribute.
-// specified.  Addresses <rdar://problem/7653912>.
+// specified.
 
 // expected-no-diagnostics
 __declspec(dllimport) int __cdecl foo(void);
diff --git a/clang/test/Rewriter/modern-write-bf-abi.mm b/clang/test/Rewriter/modern-write-bf-abi.mm
index 70e1141..fa127f0 100644
--- a/clang/test/Rewriter/modern-write-bf-abi.mm
+++ b/clang/test/Rewriter/modern-write-bf-abi.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar://13138459
 
 // -Did="void*" -DSEL="void *" -DClass="void*"
 @interface NSMutableArray {
diff --git a/clang/test/Rewriter/no-integrated-preprocessing-64bit.m b/clang/test/Rewriter/no-integrated-preprocessing-64bit.m
index ea63c0b..81afe2e 100644
--- a/clang/test/Rewriter/no-integrated-preprocessing-64bit.m
+++ b/clang/test/Rewriter/no-integrated-preprocessing-64bit.m
@@ -1,5 +1,4 @@
 // RUN: %clang -target x86_64-unknown-unknown -fms-extensions -rewrite-objc %s -o - | FileCheck %s
-// rdar://12189793
 
 #ifdef __cplusplus
 
diff --git a/clang/test/Rewriter/no-integrated-preprocessing.m b/clang/test/Rewriter/no-integrated-preprocessing.m
index bc27a63..c53c660 100644
--- a/clang/test/Rewriter/no-integrated-preprocessing.m
+++ b/clang/test/Rewriter/no-integrated-preprocessing.m
@@ -1,6 +1,5 @@
 // RUN: %clang -target i386-unknown-unknown -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: FileCheck %s < %t-rw.cpp
-// rdar://12189793
 
 #ifdef __cplusplus
 
diff --git a/clang/test/Rewriter/objc-bool-literal-check-modern.mm b/clang/test/Rewriter/objc-bool-literal-check-modern.mm
index 3386197..12eaafe 100644
--- a/clang/test/Rewriter/objc-bool-literal-check-modern.mm
+++ b/clang/test/Rewriter/objc-bool-literal-check-modern.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s 
-// rdar://11124775
 
 typedef bool BOOL;
 
diff --git a/clang/test/Rewriter/objc-bool-literal-modern-1.mm b/clang/test/Rewriter/objc-bool-literal-modern-1.mm
index 7aaa79b..a593382 100644
--- a/clang/test/Rewriter/objc-bool-literal-modern-1.mm
+++ b/clang/test/Rewriter/objc-bool-literal-modern-1.mm
@@ -1,8 +1,6 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp 
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"__declspec(X)=" %t-rw.cpp
-// rdar://11231426
 
-// rdar://11375908
 typedef unsigned long size_t;
 
 typedef bool BOOL;
diff --git a/clang/test/Rewriter/objc-bool-literal-modern.mm b/clang/test/Rewriter/objc-bool-literal-modern.mm
index 328ee6b..c84ff93 100644
--- a/clang/test/Rewriter/objc-bool-literal-modern.mm
+++ b/clang/test/Rewriter/objc-bool-literal-modern.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %s -o %t-rw.cpp 
 // RUN: %clang_cc1 -fsyntax-only -D"__declspec(X)=" %t-rw.cpp
-// rdar://11124775
 
 typedef bool BOOL;
 
diff --git a/clang/test/Rewriter/objc-modern-StretAPI-2.mm b/clang/test/Rewriter/objc-modern-StretAPI-2.mm
index 961fc16..6ac361b 100644
--- a/clang/test/Rewriter/objc-modern-StretAPI-2.mm
+++ b/clang/test/Rewriter/objc-modern-StretAPI-2.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://12142241
 
 extern "C" void *sel_registerName(const char *);
 typedef unsigned long size_t;
diff --git a/clang/test/Rewriter/objc-modern-StretAPI-3.mm b/clang/test/Rewriter/objc-modern-StretAPI-3.mm
index 3ada56e..a2c8786 100644
--- a/clang/test/Rewriter/objc-modern-StretAPI-3.mm
+++ b/clang/test/Rewriter/objc-modern-StretAPI-3.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://14932320
 
 extern "C" void *sel_registerName(const char *);
 typedef unsigned long size_t;
diff --git a/clang/test/Rewriter/objc-modern-StretAPI.mm b/clang/test/Rewriter/objc-modern-StretAPI.mm
index 129b56c..618c229 100644
--- a/clang/test/Rewriter/objc-modern-StretAPI.mm
+++ b/clang/test/Rewriter/objc-modern-StretAPI.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://11359268
 
 extern "C" void *sel_registerName(const char *);
 typedef unsigned long size_t;
diff --git a/clang/test/Rewriter/objc-modern-class-init-hooks.mm b/clang/test/Rewriter/objc-modern-class-init-hooks.mm
index c294c79..0e19268b 100644
--- a/clang/test/Rewriter/objc-modern-class-init-hooks.mm
+++ b/clang/test/Rewriter/objc-modern-class-init-hooks.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s 
-// rdar:// 11124354
 
 @interface Root @end
 
diff --git a/clang/test/Rewriter/objc-modern-class-init.mm b/clang/test/Rewriter/objc-modern-class-init.mm
index b0326a4..1618bae 100644
--- a/clang/test/Rewriter/objc-modern-class-init.mm
+++ b/clang/test/Rewriter/objc-modern-class-init.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp 
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 11076938
 
 @interface Root @end
 
diff --git a/clang/test/Rewriter/objc-modern-container-subscript.mm b/clang/test/Rewriter/objc-modern-container-subscript.mm
index cdcff03..7c417eb 100644
--- a/clang/test/Rewriter/objc-modern-container-subscript.mm
+++ b/clang/test/Rewriter/objc-modern-container-subscript.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://11203853
 
 typedef unsigned long size_t;
 
diff --git a/clang/test/Rewriter/objc-modern-fast-enumeration.mm b/clang/test/Rewriter/objc-modern-fast-enumeration.mm
index 0ffaa26..082b047 100644
--- a/clang/test/Rewriter/objc-modern-fast-enumeration.mm
+++ b/clang/test/Rewriter/objc-modern-fast-enumeration.mm
@@ -3,7 +3,6 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -triple i686-pc-win32 -Werror -Wno-address-of-temporary -D"Class=struct objc_class *" -D"id=struct objc_object *" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
 // RUN: %clang_cc1 -fsyntax-only -triple x86_64-pc-win32 -Werror -Wno-address-of-temporary -D"Class=struct objc_class *" -D"id=struct objc_object *" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp -Wno-attributes
-// rdar://14913632
 
 extern "C" void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/objc-modern-getclass-proto.mm b/clang/test/Rewriter/objc-modern-getclass-proto.mm
index 98e76e0..da41747 100644
--- a/clang/test/Rewriter/objc-modern-getclass-proto.mm
+++ b/clang/test/Rewriter/objc-modern-getclass-proto.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %t.mm -o %t-rw.cpp
-// rdar://11375495
 
 @interface I @end
 @implementation I @end
diff --git a/clang/test/Rewriter/objc-modern-implicit-cast.mm b/clang/test/Rewriter/objc-modern-implicit-cast.mm
index e612199..4b85251 100644
--- a/clang/test/Rewriter/objc-modern-implicit-cast.mm
+++ b/clang/test/Rewriter/objc-modern-implicit-cast.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://11202764
 
 typedef void(^BL)(void);
 
diff --git a/clang/test/Rewriter/objc-modern-ivar-receiver-1.mm b/clang/test/Rewriter/objc-modern-ivar-receiver-1.mm
index a5c17a6..cc454f3 100644
--- a/clang/test/Rewriter/objc-modern-ivar-receiver-1.mm
+++ b/clang/test/Rewriter/objc-modern-ivar-receiver-1.mm
@@ -26,6 +26,5 @@ void *sel_registerName(const char *);
 @end
 
 // CHECK: id obj = (*(id *)((char *)newInv + OBJC_IVAR_$_NSInvocation$_container));
-// rdar://11076938
 // CHECK: struct _class_t *superclass;
 // CHECK: extern "C" __declspec(dllimport) struct objc_cache _objc_empty_cache;
diff --git a/clang/test/Rewriter/objc-modern-linkage-spec.mm b/clang/test/Rewriter/objc-modern-linkage-spec.mm
index 028d787..18ef0d8 100644
--- a/clang/test/Rewriter/objc-modern-linkage-spec.mm
+++ b/clang/test/Rewriter/objc-modern-linkage-spec.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-attributes -D"__declspec(X)=" %t-rw.cpp
-// rdar://11169733
 
 extern "C" __declspec(dllexport)
 @interface Test @end
diff --git a/clang/test/Rewriter/objc-modern-metadata-visibility.mm b/clang/test/Rewriter/objc-modern-metadata-visibility.mm
index 42adf86..6a0c3c6 100644
--- a/clang/test/Rewriter/objc-modern-metadata-visibility.mm
+++ b/clang/test/Rewriter/objc-modern-metadata-visibility.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s 
-// rdar://11144048
 
 @class NSString;
 
diff --git a/clang/test/Rewriter/objc-modern-numeric-literal.mm b/clang/test/Rewriter/objc-modern-numeric-literal.mm
index aff1d47..3c7582a 100644
--- a/clang/test/Rewriter/objc-modern-numeric-literal.mm
+++ b/clang/test/Rewriter/objc-modern-numeric-literal.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s 
-// rdar://10803676
 
 extern "C" void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/objc-modern-property-attributes.mm b/clang/test/Rewriter/objc-modern-property-attributes.mm
index f0d002c..ea4875d 100644
--- a/clang/test/Rewriter/objc-modern-property-attributes.mm
+++ b/clang/test/Rewriter/objc-modern-property-attributes.mm
@@ -1,8 +1,6 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
 
-// rdar://11095151
-
 typedef void (^void_block_t)(void);
 
 @interface PropertyClass {
diff --git a/clang/test/Rewriter/objc-modern-property-bitfield.m b/clang/test/Rewriter/objc-modern-property-bitfield.m
index e7b565d..f6135e7 100644
--- a/clang/test/Rewriter/objc-modern-property-bitfield.m
+++ b/clang/test/Rewriter/objc-modern-property-bitfield.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar://13138459
 
 void *sel_registerName(const char *);
 extern void abort();
diff --git a/clang/test/Rewriter/property-dot-syntax.mm b/clang/test/Rewriter/property-dot-syntax.mm
index 140ac4a..bbc30e3 100644
--- a/clang/test/Rewriter/property-dot-syntax.mm
+++ b/clang/test/Rewriter/property-dot-syntax.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 8520727
 
 void *sel_registerName(const char *);
 
@@ -26,7 +25,6 @@ void *sel_registerName(const char *);
 }
 @end
 
-//rdar: // 8541517
 @interface A { }
 @property (retain) NSString *scheme;
 @end
diff --git a/clang/test/Rewriter/protocol-rewrite-1.m b/clang/test/Rewriter/protocol-rewrite-1.m
index 0c5104f..867f4a6 100644
--- a/clang/test/Rewriter/protocol-rewrite-1.m
+++ b/clang/test/Rewriter/protocol-rewrite-1.m
@@ -1,7 +1,5 @@
 // RUN: %clang_cc1 -x objective-c -Wno-objc-root-class -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: FileCheck  --input-file=%t-rw.cpp %s
-// rdar://9846759
-// rdar://15517895
 
 typedef struct MyWidget {
   int a;
@@ -50,7 +48,6 @@ int main(void) {
   return 0;
 }
 
-// rdar://15517895
 @class NSObject;
 
 @interface NSProtocolChecker
diff --git a/clang/test/Rewriter/protocol-rewrite-2.m b/clang/test/Rewriter/protocol-rewrite-2.m
index e0d59e8..a49168b 100644
--- a/clang/test/Rewriter/protocol-rewrite-2.m
+++ b/clang/test/Rewriter/protocol-rewrite-2.m
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t.cpp
 // RUN: %clang_cc1 -fsyntax-only %t.cpp
 
-// rdar://10234024
 @protocol Foo;
 @protocol Foo
 @end
diff --git a/clang/test/Rewriter/rewrite-anonymous-union.m b/clang/test/Rewriter/rewrite-anonymous-union.m
index bc35fd0..b5b1aa4 100644
--- a/clang/test/Rewriter/rewrite-anonymous-union.m
+++ b/clang/test/Rewriter/rewrite-anonymous-union.m
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  -o - %s
-// rdar://6948022
 
 typedef unsigned int uint32_t;
 
diff --git a/clang/test/Rewriter/rewrite-block-argument.m b/clang/test/Rewriter/rewrite-block-argument.m
index 4e1194d..dbcd237 100644
--- a/clang/test/Rewriter/rewrite-block-argument.m
+++ b/clang/test/Rewriter/rewrite-block-argument.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" -emit-llvm -o %t %t-rw.cpp
-// radar 7987817
 
 void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-block-consts.mm b/clang/test/Rewriter/rewrite-block-consts.mm
index 1b32b35..fb29d9f 100644
--- a/clang/test/Rewriter/rewrite-block-consts.mm
+++ b/clang/test/Rewriter/rewrite-block-consts.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D__block="" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 8243071
 
 void x(int y) {}
 void f() {
diff --git a/clang/test/Rewriter/rewrite-block-literal-1.mm b/clang/test/Rewriter/rewrite-block-literal-1.mm
index 6820a07..a395926 100644
--- a/clang/test/Rewriter/rewrite-block-literal-1.mm
+++ b/clang/test/Rewriter/rewrite-block-literal-1.mm
@@ -1,11 +1,9 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 9254348
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar://11259664
 
-// rdar://11375908
+
 typedef unsigned long size_t;
 
 void *sel_registerName(const char *);
diff --git a/clang/test/Rewriter/rewrite-block-literal.mm b/clang/test/Rewriter/rewrite-block-literal.mm
index cde6efc..f9d0d20 100644
--- a/clang/test/Rewriter/rewrite-block-literal.mm
+++ b/clang/test/Rewriter/rewrite-block-literal.mm
@@ -5,11 +5,8 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 
-// rdar://11375908
 typedef unsigned long size_t;
 
-// rdar: // 11006566
-
 void I( void (^)(void));
 void (^noop)(void);
 
diff --git a/clang/test/Rewriter/rewrite-block-pointer.mm b/clang/test/Rewriter/rewrite-block-pointer.mm
index b8a5ee8..7dda941 100644
--- a/clang/test/Rewriter/rewrite-block-pointer.mm
+++ b/clang/test/Rewriter/rewrite-block-pointer.mm
@@ -2,9 +2,7 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 7638400
 
-// rdar://11375908
 typedef unsigned long size_t;
 
 typedef void * id;
@@ -21,7 +19,6 @@ static void enumerateIt(void (^block)(id, id, char *)) {
 }
 @end
 
-// radar 7651312
 void apply(void (^block)(int));
 
 static void x(int (^cmp)(int, int)) {
@@ -34,13 +31,11 @@ static void y(int (^cmp)(int, int)) {
     });
 }
 
-// radar 7659483
 void *_Block_copy(const void *aBlock);
 void x(void (^block)(void)) {
         block = ((__typeof(block))_Block_copy((const void *)(block)));
 }
 
-// radar 7682763
 @interface Y {
 @private
     id _private;
@@ -63,7 +58,6 @@ typedef void (^void_block_t)(void);
 
 @end
 
-// rdar: //8608902
 @protocol CoreDAVAccountInfoProvider;
 @protocol CodeProvider;
 typedef void (^BDVDiscoveryCompletionHandler)(int success, id<CoreDAVAccountInfoProvider> discoveredInfo);
diff --git a/clang/test/Rewriter/rewrite-block-property.m b/clang/test/Rewriter/rewrite-block-property.m
index 1328ab7..242ca3e 100644
--- a/clang/test/Rewriter/rewrite-block-property.m
+++ b/clang/test/Rewriter/rewrite-block-property.m
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 
-// rdar://9055596
 void *sel_registerName(const char *);
 
 typedef void (^FooBlock) (int foo, int bar, int baz);
diff --git a/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm b/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
index fce5890..d433fe4 100644
--- a/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
+++ b/clang/test/Rewriter/rewrite-byref-in-nested-blocks.mm
@@ -2,9 +2,7 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec  -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 7692350
 
-// rdar://11375908
 typedef unsigned long size_t;
 
 void f(void (^block)(void));
@@ -18,7 +16,6 @@ void f(void (^block)(void));
 @implementation X
 - (void)foo {
         __block int kerfluffle;
-        // radar 7692183
         __block int x;
         f(^{
                 f(^{
diff --git a/clang/test/Rewriter/rewrite-byref-vars.mm b/clang/test/Rewriter/rewrite-byref-vars.mm
index 2838c44..41f4e8d 100644
--- a/clang/test/Rewriter/rewrite-byref-vars.mm
+++ b/clang/test/Rewriter/rewrite-byref-vars.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7540194
 
 extern "C" __declspec(dllexport) void BreakTheRewriter(int i) {
         __block int aBlockVariable = 0;
@@ -37,12 +36,12 @@ __declspec(dllexport) extern "C" __declspec(dllexport) void XXXXBreakTheRewriter
    id list;
 }
 - (void) Meth;
-// radar 7589385 use before definition
+// use before definition
 - (void) allObjects;
 @end
 
 @implementation I
-// radar 7589385 use before definition
+// use before definition
 - (void) allObjects {
     __attribute__((__blocks__(byref))) id *listp;
 
diff --git a/clang/test/Rewriter/rewrite-captured-nested-bvar.c b/clang/test/Rewriter/rewrite-captured-nested-bvar.c
index 60029e7..34236dd 100644
--- a/clang/test/Rewriter/rewrite-captured-nested-bvar.c
+++ b/clang/test/Rewriter/rewrite-captured-nested-bvar.c
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x c -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: FileCheck --input-file=%t-rw.cpp %s
-// rdar://9006279
 
 void q(void (^p)(void)) {
     p();
diff --git a/clang/test/Rewriter/rewrite-cast-ivar-access.mm b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
index d5c2796..37ed7b3 100644
--- a/clang/test/Rewriter/rewrite-cast-ivar-access.mm
+++ b/clang/test/Rewriter/rewrite-cast-ivar-access.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
-// radar 7575882
 
 @interface F {
   int supervar;
@@ -25,7 +24,6 @@ void __CFAssignWithWriteBarrier(void **location, void *value) {
         objc_assign_strongCast((id)value);
 }
 
-// radar 7607605
 @interface RealClass {
         @public
         int f;
diff --git a/clang/test/Rewriter/rewrite-cast-ivar-modern-access.mm b/clang/test/Rewriter/rewrite-cast-ivar-modern-access.mm
index 4cea4f6..69c7eec 100644
--- a/clang/test/Rewriter/rewrite-cast-ivar-modern-access.mm
+++ b/clang/test/Rewriter/rewrite-cast-ivar-modern-access.mm
@@ -24,7 +24,6 @@ void __CFAssignWithWriteBarrier(void **location, void *value) {
         objc_assign_strongCast((id)value);
 }
 
-// radar 7607605
 @interface RealClass {
         @public
         int f;
diff --git a/clang/test/Rewriter/rewrite-cast-to-bool.mm b/clang/test/Rewriter/rewrite-cast-to-bool.mm
index 58db706..9fd5bb5 100644
--- a/clang/test/Rewriter/rewrite-cast-to-bool.mm
+++ b/clang/test/Rewriter/rewrite-cast-to-bool.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 9899834
 
 void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-category-property.mm b/clang/test/Rewriter/rewrite-category-property.mm
index c0f530e..ae38b82 100644
--- a/clang/test/Rewriter/rewrite-category-property.mm
+++ b/clang/test/Rewriter/rewrite-category-property.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
-// radar 7630636
 
 @class Y, Z;
 
diff --git a/clang/test/Rewriter/rewrite-constructor-init.mm b/clang/test/Rewriter/rewrite-constructor-init.mm
index fa0e148..c13dcc5 100644
--- a/clang/test/Rewriter/rewrite-constructor-init.mm
+++ b/clang/test/Rewriter/rewrite-constructor-init.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar : // 8213998
 
 typedef unsigned int NSUInteger;
 
diff --git a/clang/test/Rewriter/rewrite-eh.m b/clang/test/Rewriter/rewrite-eh.m
index 6e6fb1c..d20cdb8 100644
--- a/clang/test/Rewriter/rewrite-eh.m
+++ b/clang/test/Rewriter/rewrite-eh.m
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  -fobjc-exceptions -o - %s
-// rdar://7522880
 
 @interface NSException
 @end
diff --git a/clang/test/Rewriter/rewrite-elaborated-type.mm b/clang/test/Rewriter/rewrite-elaborated-type.mm
index c813a3b..f9dcea7 100644
--- a/clang/test/Rewriter/rewrite-elaborated-type.mm
+++ b/clang/test/Rewriter/rewrite-elaborated-type.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D_Bool=bool -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D_Bool=bool -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 8143056
 
 typedef struct objc_class *Class;
 typedef unsigned NSPointerFunctionsOptions;
diff --git a/clang/test/Rewriter/rewrite-extern-c.mm b/clang/test/Rewriter/rewrite-extern-c.mm
index cf37d75..2941504 100644
--- a/clang/test/Rewriter/rewrite-extern-c.mm
+++ b/clang/test/Rewriter/rewrite-extern-c.mm
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 -o - %s
-// radar 7546096
 
 extern "C" {
         short foo() { } 
diff --git a/clang/test/Rewriter/rewrite-foreach-6.m b/clang/test/Rewriter/rewrite-foreach-6.m
index 29d21af..86673f8c 100644
--- a/clang/test/Rewriter/rewrite-foreach-6.m
+++ b/clang/test/Rewriter/rewrite-foreach-6.m
@@ -1,8 +1,7 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"id=struct objc_object*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://5716356
-// FIXME: Should be able to pipe into clang, but code is not
-// yet correct for other reasons: rdar://5716940
+// FIXME: Should be able to pipe into clang, but code is not yet correct for
+// other reasons.
 
 void *sel_registerName(const char *);
 void objc_enumerationMutation(id);
diff --git a/clang/test/Rewriter/rewrite-foreach-in-block.mm b/clang/test/Rewriter/rewrite-foreach-in-block.mm
index 8506701..b7d1dc1 100644
--- a/clang/test/Rewriter/rewrite-foreach-in-block.mm
+++ b/clang/test/Rewriter/rewrite-foreach-in-block.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"id=struct objc_object*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"id=struct objc_object*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar:// 9878420
 
 typedef unsigned long size_t;
 
diff --git a/clang/test/Rewriter/rewrite-foreach-protocol-id.m b/clang/test/Rewriter/rewrite-foreach-protocol-id.m
index 7f046be..48d94e9 100644
--- a/clang/test/Rewriter/rewrite-foreach-protocol-id.m
+++ b/clang/test/Rewriter/rewrite-foreach-protocol-id.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=struct objc_object*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 9039342
 
 void *sel_registerName(const char *);
 void objc_enumerationMutation(id);
diff --git a/clang/test/Rewriter/rewrite-forward-class.m b/clang/test/Rewriter/rewrite-forward-class.m
index 7c2fdc2..0ec99c5 100644
--- a/clang/test/Rewriter/rewrite-forward-class.m
+++ b/clang/test/Rewriter/rewrite-forward-class.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://6969189
 
 @class XX;
 @class YY, ZZ, QQ;
diff --git a/clang/test/Rewriter/rewrite-forward-class.mm b/clang/test/Rewriter/rewrite-forward-class.mm
index 05cd570..616dd93 100644
--- a/clang/test/Rewriter/rewrite-forward-class.mm
+++ b/clang/test/Rewriter/rewrite-forward-class.mm
@@ -41,8 +41,6 @@ int I,J,K;
 
 };
 
-
-// rdar://15027032
 @interface ISDPropertyChangeGroup
 @end
 
diff --git a/clang/test/Rewriter/rewrite-implementation.mm b/clang/test/Rewriter/rewrite-implementation.mm
index 8ef4ebe..acb11d5 100644
--- a/clang/test/Rewriter/rewrite-implementation.mm
+++ b/clang/test/Rewriter/rewrite-implementation.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7649577
 
 @interface a
 @end
diff --git a/clang/test/Rewriter/rewrite-interface-locals.mm b/clang/test/Rewriter/rewrite-interface-locals.mm
index ef36105..513c435 100644
--- a/clang/test/Rewriter/rewrite-interface-locals.mm
+++ b/clang/test/Rewriter/rewrite-interface-locals.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://15143875
 
 @class NSData, NSError;
 
diff --git a/clang/test/Rewriter/rewrite-ivar-use.m b/clang/test/Rewriter/rewrite-ivar-use.m
index 0b697b0..793dd6f 100644
--- a/clang/test/Rewriter/rewrite-ivar-use.m
+++ b/clang/test/Rewriter/rewrite-ivar-use.m
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7490331
 
 void *sel_registerName(const char *);
 
@@ -13,7 +12,6 @@ void *sel_registerName(const char *);
 @end
 
 @implementation Foo
-// radar 7522803
 static void foo(id bar) {
         int i = ((Foo *)bar)->a;
 }
diff --git a/clang/test/Rewriter/rewrite-line-directive.m b/clang/test/Rewriter/rewrite-line-directive.m
index ec50a83..bfb7f14 100644
--- a/clang/test/Rewriter/rewrite-line-directive.m
+++ b/clang/test/Rewriter/rewrite-line-directive.m
@@ -3,7 +3,6 @@
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
 // RUN: %clang -g -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
 // RUN: FileCheck -check-prefix CHECK-LPG --input-file=%t-rw.cpp %s
-// rdar://13138170
 
 int z();
 
diff --git a/clang/test/Rewriter/rewrite-local-externs-in-block.mm b/clang/test/Rewriter/rewrite-local-externs-in-block.mm
index b31b422..a3d71fd 100644
--- a/clang/test/Rewriter/rewrite-local-externs-in-block.mm
+++ b/clang/test/Rewriter/rewrite-local-externs-in-block.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7735987
 
 extern "C" int printf(const char*, ...);
 
diff --git a/clang/test/Rewriter/rewrite-local-static-id.mm b/clang/test/Rewriter/rewrite-local-static-id.mm
index b3d2c48..067cfd8 100644
--- a/clang/test/Rewriter/rewrite-local-static-id.mm
+++ b/clang/test/Rewriter/rewrite-local-static-id.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" -emit-llvm -o %t %t-rw.cpp
-// radar 7946975
 
 void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-message-expr.mm b/clang/test/Rewriter/rewrite-message-expr.mm
index 04e27e5..10398cb 100644
--- a/clang/test/Rewriter/rewrite-message-expr.mm
+++ b/clang/test/Rewriter/rewrite-message-expr.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: FileCheck -check-prefix CHECK-LP --input-file=%t-rw.cpp %s
-// radar 7617047
 
 @interface Baz
 - (id)y;
diff --git a/clang/test/Rewriter/rewrite-modern-array-literal.mm b/clang/test/Rewriter/rewrite-modern-array-literal.mm
index c1431ea..bc9a37e 100644
--- a/clang/test/Rewriter/rewrite-modern-array-literal.mm
+++ b/clang/test/Rewriter/rewrite-modern-array-literal.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://10803676
 
 extern "C" void *sel_registerName(const char *);
 @class NSString;
diff --git a/clang/test/Rewriter/rewrite-modern-atautoreleasepool.mm b/clang/test/Rewriter/rewrite-modern-atautoreleasepool.mm
index f5d2956..a4270f0 100644
--- a/clang/test/Rewriter/rewrite-modern-atautoreleasepool.mm
+++ b/clang/test/Rewriter/rewrite-modern-atautoreleasepool.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp
 // RUN: FileCheck --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 11474836
 
 extern "C"
 void *sel_registerName(const char *);
diff --git a/clang/test/Rewriter/rewrite-modern-block-consts.mm b/clang/test/Rewriter/rewrite-modern-block-consts.mm
index 48c8d40..4af9e29 100644
--- a/clang/test/Rewriter/rewrite-modern-block-consts.mm
+++ b/clang/test/Rewriter/rewrite-modern-block-consts.mm
@@ -1,8 +1,6 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar:// 8243071
 
-// rdar://11375908
 typedef unsigned long size_t;
 
 void x(int y) {}
diff --git a/clang/test/Rewriter/rewrite-modern-block.mm b/clang/test/Rewriter/rewrite-modern-block.mm
index 926ee36..6841ab4 100644
--- a/clang/test/Rewriter/rewrite-modern-block.mm
+++ b/clang/test/Rewriter/rewrite-modern-block.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
-// rdar://11230308
 
 typedef unsigned long size_t;
 typedef struct {
@@ -18,13 +17,11 @@ void y() {
     };
 }
 
-// rdar://11236342
 int foo() {
     __block int hello;
     return hello;
 }
 
-// rdar://7547630
 // rewriting multiple __block decls on wintin same decl stmt.
 void radar7547630() {
   __block int BI1, BI2;
@@ -47,7 +44,6 @@ int  rdar7547630(const char *keybuf, const char *valuebuf) {
   return BI2;
 }
 
-// rdar://11326988
 typedef struct _z {
     int location;
     int length;
@@ -64,5 +60,4 @@ z w(int loc, int len);
 }
 @end
 
-// rdar://18799145
 int Test18799145() { return ^(){return 0;}(); }
diff --git a/clang/test/Rewriter/rewrite-modern-captured-nested-bvar.mm b/clang/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
index d1457dc..b85515e 100644
--- a/clang/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
+++ b/clang/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
-// rdar://9006279
 
 void q(void (^p)(void)) {
     p();
diff --git a/clang/test/Rewriter/rewrite-modern-container-literal.mm b/clang/test/Rewriter/rewrite-modern-container-literal.mm
index 8a52791..4c1c90c 100644
--- a/clang/test/Rewriter/rewrite-modern-container-literal.mm
+++ b/clang/test/Rewriter/rewrite-modern-container-literal.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://10803676
 
 void *sel_registerName(const char *);
 typedef unsigned long NSUInteger;
diff --git a/clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm b/clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
index 4a772af..9aa8adb 100644
--- a/clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
+++ b/clang/test/Rewriter/rewrite-modern-default-property-synthesis.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -x objective-c++ -fms-extensions -rewrite-objc %t.mm -o %t-rw.cpp 
 // RUN: FileCheck --input-file=%t-rw.cpp %s
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -DSEL="void *" -Did="struct objc_object *" -Wno-attributes -Wno-address-of-temporary -U__declspec -D"__declspec(X)=" %t-rw.cpp
-// rdar://11374235
 
 extern "C" void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm b/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
index af8c2d6..dcbc06c9 100644
--- a/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
+++ b/clang/test/Rewriter/rewrite-modern-extern-c-func-decl.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -fms-extensions -U__declspec -rewrite-objc -x objective-c++ -fblocks -o %t-rw.cpp %s
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Werror -Wno-address-of-temporary -Wno-attributes -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
-// rdar://11131490
 
 typedef unsigned long size_t;
 extern "C" __declspec(dllexport) void BreakTheRewriter(void) {
@@ -45,7 +44,6 @@ main (int argc, char *argv[])
         };
 }
 
-// rdar://11275241
 static char stringtype;
 char CFStringGetTypeID();
 void x(void (^)());
@@ -66,7 +64,6 @@ static void initStatics2() {
     });
 }
 
-// rdar://11314329
 static inline const void *auto_zone_base_pointer(void *zone, const void *ptr) { return 0; }
 
 @interface I
@@ -74,12 +71,12 @@ static inline const void *auto_zone_base_pointer(void *zone, const void *ptr) {
    id list;
 }
 - (void) Meth;
-// radar 7589385 use before definition
+// use before definition
 - (void) allObjects;
 @end
 
 @implementation I
-// radar 7589385 use before definition
+// use before definition
 - (void) allObjects {
     __attribute__((__blocks__(byref))) id *listp;
 
diff --git a/clang/test/Rewriter/rewrite-modern-ivar-use.mm b/clang/test/Rewriter/rewrite-modern-ivar-use.mm
index 8e72938..1abc63b 100644
--- a/clang/test/Rewriter/rewrite-modern-ivar-use.mm
+++ b/clang/test/Rewriter/rewrite-modern-ivar-use.mm
@@ -12,7 +12,6 @@ void *sel_registerName(const char *);
 @end
 
 @implementation Foo
-// radar 7522803
 static void foo(id bar) {
         int i = ((Foo *)bar)->a;
 }
diff --git a/clang/test/Rewriter/rewrite-modern-ivars-2.mm b/clang/test/Rewriter/rewrite-modern-ivars-2.mm
index 65ccd62..52304ea 100644
--- a/clang/test/Rewriter/rewrite-modern-ivars-2.mm
+++ b/clang/test/Rewriter/rewrite-modern-ivars-2.mm
@@ -71,8 +71,6 @@ typedef unsigned int FSCatalogInfoBitmap;
 
 @implementation NSFileLocationComponent @end
 
-// rdar://11229770
-
 @interface Foo {
   int bar:26;
 }
diff --git a/clang/test/Rewriter/rewrite-modern-private-ivars.mm b/clang/test/Rewriter/rewrite-modern-private-ivars.mm
index fc2e73b..01020a0 100644
--- a/clang/test/Rewriter/rewrite-modern-private-ivars.mm
+++ b/clang/test/Rewriter/rewrite-modern-private-ivars.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
 // RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
-// rdar://11351299
 
 struct Q {
   int x;
diff --git a/clang/test/Rewriter/rewrite-modern-protocol-1.mm b/clang/test/Rewriter/rewrite-modern-protocol-1.mm
index 7b737fe..0cde386 100644
--- a/clang/test/Rewriter/rewrite-modern-protocol-1.mm
+++ b/clang/test/Rewriter/rewrite-modern-protocol-1.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s
-// rdar://11248048
 
 @protocol NSCopying @end
 
diff --git a/clang/test/Rewriter/rewrite-modern-qualified-type.mm b/clang/test/Rewriter/rewrite-modern-qualified-type.mm
index 53e0d23..0652c51 100644
--- a/clang/test/Rewriter/rewrite-modern-qualified-type.mm
+++ b/clang/test/Rewriter/rewrite-modern-qualified-type.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D_Bool=bool -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// rdar://13562505
 
 @protocol OS_dispatch_object @end
 
diff --git a/clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm b/clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
index e54b1cd..ff34ff5 100644
--- a/clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
+++ b/clang/test/Rewriter/rewrite-modern-struct-ivar-1.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -fblocks -rewrite-objc -fms-extensions %s -o %t-rw.cpp
 // RUN: %clang_cc1 -Werror -fsyntax-only -Wno-address-of-temporary -Wno-c++11-narrowing -std=c++11 -D"Class=void*" -D"id=void*" -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
-// rdar://11323187
 
 typedef unsigned long NSUInteger;
 
diff --git a/clang/test/Rewriter/rewrite-modern-struct-ivar.mm b/clang/test/Rewriter/rewrite-modern-struct-ivar.mm
index f98bdbc..d6c64ea 100644
--- a/clang/test/Rewriter/rewrite-modern-struct-ivar.mm
+++ b/clang/test/Rewriter/rewrite-modern-struct-ivar.mm
@@ -23,7 +23,6 @@ struct S {
 
 // CHECK: return (*(struct S *)((char *)self + OBJC_IVAR_$_I$struct_ivar));
 
-// rdar://11323187
 @interface Foo{
     @protected 
     struct {
diff --git a/clang/test/Rewriter/rewrite-modern-super.mm b/clang/test/Rewriter/rewrite-modern-super.mm
index ee397b3..2af6ec1 100644
--- a/clang/test/Rewriter/rewrite-modern-super.mm
+++ b/clang/test/Rewriter/rewrite-modern-super.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp 
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"id=struct objc_object *" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar://11239894
 
 extern "C" void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-modern-synchronized.m b/clang/test/Rewriter/rewrite-modern-synchronized.m
index 59bc87d..6065065 100644
--- a/clang/test/Rewriter/rewrite-modern-synchronized.m
+++ b/clang/test/Rewriter/rewrite-modern-synchronized.m
@@ -33,7 +33,6 @@ void test_sync_with_implicit_finally(void) {
     }
 }
 
-// rdar://14993814
 @interface NSObject @end
 
 @interface I : NSObject @end
diff --git a/clang/test/Rewriter/rewrite-modern-throw.m b/clang/test/Rewriter/rewrite-modern-throw.m
index e2a2acd..c9a5414 100644
--- a/clang/test/Rewriter/rewrite-modern-throw.m
+++ b/clang/test/Rewriter/rewrite-modern-throw.m
@@ -66,7 +66,6 @@ int main(void)
 }
 @end
 
-// rdar://13186010
 @class NSDictionary, NSException;
 @class NSMutableDictionary;
 
diff --git a/clang/test/Rewriter/rewrite-modern-typeof.mm b/clang/test/Rewriter/rewrite-modern-typeof.mm
index 91e0b62..6136563 100644
--- a/clang/test/Rewriter/rewrite-modern-typeof.mm
+++ b/clang/test/Rewriter/rewrite-modern-typeof.mm
@@ -23,7 +23,6 @@ int main() {
 
 // CHECK-LP: ((void (^)(void))_Block_copy((const void *)(b)))
 
-// radar 7628153
 void f() {
 	int a;	
 	__typeof__(a) aVal = a;
@@ -35,7 +34,6 @@ void f() {
 
 }
 
-// rdar://11239324
 void x() {
     id y;
     void (^z)() = ^{ };
diff --git a/clang/test/Rewriter/rewrite-nested-blocks-1.mm b/clang/test/Rewriter/rewrite-nested-blocks-1.mm
index 416fd97..27eb054 100644
--- a/clang/test/Rewriter/rewrite-nested-blocks-1.mm
+++ b/clang/test/Rewriter/rewrite-nested-blocks-1.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 7696893
 
 typedef unsigned long size_t;
 void *sel_registerName(const char *);
diff --git a/clang/test/Rewriter/rewrite-nested-blocks-2.mm b/clang/test/Rewriter/rewrite-nested-blocks-2.mm
index 46afdf1..a7a83f6 100644
--- a/clang/test/Rewriter/rewrite-nested-blocks-2.mm
+++ b/clang/test/Rewriter/rewrite-nested-blocks-2.mm
@@ -4,7 +4,6 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
 // grep "static void __FUNC_block_copy_" %t-modern-rw.cpp | count 2
-// rdar://8499592
 
 typedef unsigned long size_t;
 void Outer(void (^bk)());
diff --git a/clang/test/Rewriter/rewrite-nested-blocks.mm b/clang/test/Rewriter/rewrite-nested-blocks.mm
index da3106c..c379773 100644
--- a/clang/test/Rewriter/rewrite-nested-blocks.mm
+++ b/clang/test/Rewriter/rewrite-nested-blocks.mm
@@ -2,8 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 7682149
-
 
 typedef unsigned long size_t;
 void f(void (^block)(void));
@@ -40,7 +38,6 @@ void foo () {
 	});
 }
 
-// radar 7692419
 @interface Bar
 @end
 
diff --git a/clang/test/Rewriter/rewrite-nested-ivar.mm b/clang/test/Rewriter/rewrite-nested-ivar.mm
index 47504b5..5b8c2dd 100644
--- a/clang/test/Rewriter/rewrite-nested-ivar.mm
+++ b/clang/test/Rewriter/rewrite-nested-ivar.mm
@@ -2,8 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw-modern.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw-modern.cpp
-// radar 7583971
-
 
 @interface NSURLResponse {
 @public
diff --git a/clang/test/Rewriter/rewrite-nested-property-in-blocks.mm b/clang/test/Rewriter/rewrite-nested-property-in-blocks.mm
index de34ac8..71e97a1 100644
--- a/clang/test/Rewriter/rewrite-nested-property-in-blocks.mm
+++ b/clang/test/Rewriter/rewrite-nested-property-in-blocks.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -triple i686-pc-windows -fsyntax-only -fms-extensions -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -triple i686-pc-windows -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -triple i686-pc-windows -fsyntax-only -fms-extensions -Wno-address-of-temporary -Did="void *" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 8608293
 
 typedef unsigned long size_t;
 void *sel_registerName(const char *);
diff --git a/clang/test/Rewriter/rewrite-no-nextline.mm b/clang/test/Rewriter/rewrite-no-nextline.mm
index 51f412f..3d51429 100644
--- a/clang/test/Rewriter/rewrite-no-nextline.mm
+++ b/clang/test/Rewriter/rewrite-no-nextline.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7946975
 
 @interface RootObject {
 }
diff --git a/clang/test/Rewriter/rewrite-property-attributes.mm b/clang/test/Rewriter/rewrite-property-attributes.mm
index 0c7871c..5d70147 100644
--- a/clang/test/Rewriter/rewrite-property-attributes.mm
+++ b/clang/test/Rewriter/rewrite-property-attributes.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -Wno-address-of-temporary  -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7214439
 
 typedef void (^void_block_t)(void);
 
diff --git a/clang/test/Rewriter/rewrite-property-set-cfstring.mm b/clang/test/Rewriter/rewrite-property-set-cfstring.mm
index 964d1a0..9c1d2de 100644
--- a/clang/test/Rewriter/rewrite-property-set-cfstring.mm
+++ b/clang/test/Rewriter/rewrite-property-set-cfstring.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 8527018
 
 void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-protocol-property.mm b/clang/test/Rewriter/rewrite-protocol-property.mm
index 599ee85..e5559f7 100644
--- a/clang/test/Rewriter/rewrite-protocol-property.mm
+++ b/clang/test/Rewriter/rewrite-protocol-property.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -Did="void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 8558702
 
 @class NSString;
 @interface NSObject @end
diff --git a/clang/test/Rewriter/rewrite-protocol-qualified.mm b/clang/test/Rewriter/rewrite-protocol-qualified.mm
index 7a7eed7..316607d 100644
--- a/clang/test/Rewriter/rewrite-protocol-qualified.mm
+++ b/clang/test/Rewriter/rewrite-protocol-qualified.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"id=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7589414
 
 @protocol NSPortDelegate;
 @interface NSConnection @end
@@ -16,7 +15,6 @@
 }
 @end
 
-// radar 7607413
 @protocol Proto1, Proto2;
 
 @protocol Proto
@@ -31,7 +29,6 @@ void f() {
         id b = bar((id <Proto>)a);
 }
 
-// rdar://8472487
 @protocol NSObject @end
 @class NSRunLoop;
 
@@ -39,8 +36,6 @@ void f() {
   @property (retain) NSRunLoop *workRunLoop;  
 @end
 
-
-// rdar://8475819
 @protocol some_protocol;
 
 void foo (int n)
diff --git a/clang/test/Rewriter/rewrite-qualified-id.mm b/clang/test/Rewriter/rewrite-qualified-id.mm
index 428b655..96bc31c 100644
--- a/clang/test/Rewriter/rewrite-qualified-id.mm
+++ b/clang/test/Rewriter/rewrite-qualified-id.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// radar 7680953
 
 typedef void * id;
 
diff --git a/clang/test/Rewriter/rewrite-rewritten-initializer.mm b/clang/test/Rewriter/rewrite-rewritten-initializer.mm
index 25d1625..b24c00c 100644
--- a/clang/test/Rewriter/rewrite-rewritten-initializer.mm
+++ b/clang/test/Rewriter/rewrite-rewritten-initializer.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc %s -o %t-rw-modern.cpp
 // RUN: %clang_cc1 -fsyntax-only -Werror -Wno-address-of-temporary -D"SEL=void*" -U__declspec -D"__declspec(X)=" %t-rw-modern.cpp
-// radar 7669784
 
 typedef unsigned long size_t;
 typedef void * id;
diff --git a/clang/test/Rewriter/rewrite-super-message.mm b/clang/test/Rewriter/rewrite-super-message.mm
index def62de..c1d0888 100644
--- a/clang/test/Rewriter/rewrite-super-message.mm
+++ b/clang/test/Rewriter/rewrite-super-message.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -DKEEP_ATTRIBUTES -D"id=struct objc_object *" -D"Class=struct objc_class *" -D"SEL=void*" -D"__declspec(X)=" -emit-llvm -o - %t-rw.cpp | FileCheck %t-rw.cpp
-// radar 7738453
 
 void *sel_registerName(const char *);
 
diff --git a/clang/test/Rewriter/rewrite-trivial-constructor.mm b/clang/test/Rewriter/rewrite-trivial-constructor.mm
index e343a38..7cbcb2a 100644
--- a/clang/test/Rewriter/rewrite-trivial-constructor.mm
+++ b/clang/test/Rewriter/rewrite-trivial-constructor.mm
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 -x objective-c++ -fblocks -o - %s
-// radar 7537770
 
 typedef struct {
         int a;
diff --git a/clang/test/Rewriter/rewrite-typeof.mm b/clang/test/Rewriter/rewrite-typeof.mm
index f6790ea..c3dcf43 100644
--- a/clang/test/Rewriter/rewrite-typeof.mm
+++ b/clang/test/Rewriter/rewrite-typeof.mm
@@ -21,7 +21,6 @@ int main() {
 
 // CHECK-LP: ((void (^)(void))_Block_copy((const void *)(b)))
 
-// radar 7628153
 void f() {
 	int a;	
 	__typeof__(a) aVal = a;
diff --git a/clang/test/Rewriter/rewrite-unique-block-api.mm b/clang/test/Rewriter/rewrite-unique-block-api.mm
index 85ead11d..5058fbd 100644
--- a/clang/test/Rewriter/rewrite-unique-block-api.mm
+++ b/clang/test/Rewriter/rewrite-unique-block-api.mm
@@ -2,7 +2,6 @@
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
-// radar 7630551
 
 typedef unsigned long size_t;
 void f(void (^b)(char c));
diff --git a/clang/test/Rewriter/rewrite-user-defined-accessors.mm b/clang/test/Rewriter/rewrite-user-defined-accessors.mm
index 4c35b5c..74f092c 100644
--- a/clang/test/Rewriter/rewrite-user-defined-accessors.mm
+++ b/clang/test/Rewriter/rewrite-user-defined-accessors.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5 %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -Did="void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
-// rdar:// 8570020
 
 @interface Foo {
 	Foo *foo;
diff --git a/clang/test/Rewriter/rewrite-vararg.m b/clang/test/Rewriter/rewrite-vararg.m
index 52aa5f9..58791bb 100644
--- a/clang/test/Rewriter/rewrite-vararg.m
+++ b/clang/test/Rewriter/rewrite-vararg.m
@@ -1,7 +1,6 @@
 // RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fblocks -fms-extensions -rewrite-objc -fobjc-runtime=macosx-fragile-10.5  %s -o %t-rw.cpp
 // RUN: %clang_cc1 -fsyntax-only -std=gnu++98 -fblocks -Wno-address-of-temporary -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
 
-// rdar://9056351
 void *sel_registerName(const char *);
 
 @interface NSObject @end
diff --git a/clang/test/Rewriter/unnamed-bf-modern-write.mm b/clang/test/Rewriter/unnamed-bf-modern-write.mm
index 209cdd6..fa1e4a8 100644
--- a/clang/test/Rewriter/unnamed-bf-modern-write.mm
+++ b/clang/test/Rewriter/unnamed-bf-modern-write.mm
@@ -1,6 +1,5 @@
 // RUN: %clang_cc1 -E %s -o %t.mm
 // RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %t.mm -o - | FileCheck %s 
-// rdar://13138459
 
 @interface Foo {
 @private